Avoid translating debug messages. Per Heikki Linnakangas

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@6671 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/pgadmin/debugger/dbgPgThread.cpp b/pgadmin/debugger/dbgPgThread.cpp
index 18eaaf740652135dc4cdf2e0d44b39e9b51f78ee..8c84bd8560cf899b0ab4a8d22e7e6402d904cd55 100644 (file)
--- a/pgadmin/debugger/dbgPgThread.cpp
+++ b/pgadmin/debugger/dbgPgThread.cpp
@@ -65,7 +65,7 @@ void dbgPgThread::startCommand( const wxString &command, wxEvtHandler * caller,
     m_queueMutex.Lock();
     m_commandQueue.Append( new dbgPgThreadCommand( command, caller, eventType, params ));
 
-    wxLogDebug( _( "Queueing: %s" ), command.c_str());
+    wxLogDebug( wxT( "Queueing: %s" ), command.c_str());
 
     m_queueMutex.Unlock();
 
@@ -79,7 +79,7 @@ void dbgPgThread::startCommand( const wxString &command, wxEvtHandler * caller,
 
 void dbgPgThread::Die()
 {
-    wxLogDebug( _( "Telling the query thread to die..." ));
+    wxLogDebug( wxT( "Telling the query thread to die..." ));
     die = true;
 
     m_queueCounter.Post();
@@ -97,7 +97,7 @@ void dbgPgThread::Die()
 void * dbgPgThread::Entry( void )
 {
 
-    wxLogDebug( _( "worker thread waiting for some work to do..." ));
+    wxLogDebug( wxT( "worker thread waiting for some work to do..." ));
 
     // This thread should hang at the call to m_condition.Wait()
     // When m_condition is signaled, we wake up, send a command
@@ -110,7 +110,7 @@ void * dbgPgThread::Entry( void )
         m_currentCommand = getNextCommand();
         wxString command = m_currentCommand->getCommand();
 
-        wxLogDebug( _( "Executing: %s" ), command.c_str());
+        wxLogDebug( wxT( "Executing: %s" ), command.c_str());
 
         // This call to PQexec() will hang until we've received
         // a complete result set from the server.
@@ -248,7 +248,7 @@ void * dbgPgThread::Entry( void )
             return this;
         }
 
-        wxLogDebug(_( "Complete: %s" ), wxString(PQresStatus(PQresultStatus(result)), *conv).c_str());
+        wxLogDebug(wxT( "Complete: %s" ), wxString(PQresStatus(PQresultStatus(result)), *conv).c_str());
 
         // Notify the GUI thread that a result set is ready for display
 
@@ -345,7 +345,7 @@ dbgPgThreadCommand * dbgPgThread::getNextCommand()
 
     m_queueMutex.Lock();
 
-    wxLogDebug( _( "%d commands in queue" ), m_commandQueue.GetCount());
+    wxLogDebug( wxT( "%d commands in queue" ), m_commandQueue.GetCount());
 
     ThreadCommandList::Node * node = m_commandQueue.GetFirst();
         

diff --git a/pgadmin/debugger/dlgDirectDbg.cpp b/pgadmin/debugger/dlgDirectDbg.cpp
index 5d6ed57ff25d2380b07f8483e2bb2e4a07486396..a510b4bd57616ecc32694b59b33df31c3af727e7 100644 (file)
--- a/pgadmin/debugger/dlgDirectDbg.cpp
+++ b/pgadmin/debugger/dlgDirectDbg.cpp
@@ -686,7 +686,7 @@ void dlgDirectDbg::OnTargetComplete( wxCommandEvent & event )
 
     PGresult   * result = (PGresult *)event.GetClientData();
 
-    wxLogDebug( _( "OnTargetComplete() called\n" ));
+    wxLogDebug( wxT( "OnTargetComplete() called\n" ));
     wxLogDebug( wxT( "%s\n" ), wxString(PQresStatus( PQresultStatus( result )), wxConvUTF8).c_str());
 
     // If the query failed, write the error message to the status line, otherwise, copy the result set into the grid

diff --git a/pgadmin/dlg/dlgClasses.cpp b/pgadmin/dlg/dlgClasses.cpp
index 4a0a6bd3ab3e7be81c468906c735d7ae37abbd2e..21d65db8dafd0d7376b957d29fbfb88a9e0a68cb 100644 (file)
--- a/pgadmin/dlg/dlgClasses.cpp
+++ b/pgadmin/dlg/dlgClasses.cpp
@@ -512,7 +512,7 @@ void ExecutionDialog::OnOK(wxCommandEvent& ev)
                 txtMessages->AppendText(thread->GetMessagesAndClear());
 
             if (thread->DataSet() != NULL)
-                wxLogDebug(wxString::Format(_("%d rows."), thread->DataSet()->NumRows()));
+                wxLogDebug(wxString::Format(wxT("%d rows."), thread->DataSet()->NumRows()));
 
             if (isOk)
             {