wxMotif compilation fixes for wxDataObject and PROCESS_EVENTS (wxSocket)

[wxWidgets.git] / src / common / choiccmn.cpp

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index ceeb467b8ebd92d0b4880d5eaf5a3287f5dc208a..09e5d443d5034b4cad74cad087a0b412dc3bb22c 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "choiccmn.h"
+    #pragma implementation "choicebase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -55,7 +55,7 @@ wxString wxChoiceBase::GetStringSelection() const
 {
     int sel = GetSelection();
     wxString str;
-    wxCHECK_MSG( sel != wxNOT_FOUND, str, _T("no selection, hence no string") );
+    wxCHECK_MSG( sel != wxNOT_FOUND, str, wxT("no selection, hence no string") );
 
     str = GetString(sel);
     return str;
@@ -65,7 +65,7 @@ bool wxChoiceBase::SetStringSelection(const wxString& sel)
 {
     int selIndex = FindString(sel);
     wxCHECK_MSG( selIndex != wxNOT_FOUND, FALSE,
-                 _T("can't set selection to string not in the control") );
+                 wxT("can't set selection to string not in the control") );
 
     SetSelection(selIndex);
 
@@ -79,7 +79,7 @@ bool wxChoiceBase::SetStringSelection(const wxString& sel)
 void wxChoiceBase::SetClientObject(int n, wxClientData *data)
 {
     wxASSERT_MSG( m_clientDataItemsType != ClientData_Void,
-                  _T("can't have both object and void client data") );
+                  wxT("can't have both object and void client data") );
 
     wxClientData *clientDataOld = DoGetClientObject(n);
     if ( clientDataOld )
@@ -92,7 +92,7 @@ void wxChoiceBase::SetClientObject(int n, wxClientData *data)
 wxClientData *wxChoiceBase::GetClientObject(int n) const
 {
     wxASSERT_MSG( m_clientDataItemsType == ClientData_Object,
-                  _T("this window doesn't have object client data") );
+                  wxT("this window doesn't have object client data") );
 
     return DoGetClientObject(n);
 }
@@ -100,7 +100,7 @@ wxClientData *wxChoiceBase::GetClientObject(int n) const
 void wxChoiceBase::SetClientData(int n, void *data)
 {
     wxASSERT_MSG( m_clientDataItemsType != ClientData_Object,
-                  _T("can't have both object and void client data") );
+                  wxT("can't have both object and void client data") );
 
     DoSetClientData(n, data);
     m_clientDataItemsType = ClientData_Void;
@@ -109,7 +109,7 @@ void wxChoiceBase::SetClientData(int n, void *data)
 void *wxChoiceBase::GetClientData(int n) const
 {
     wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
-                  _T("this window doesn't have void client data") );
+                  wxT("this window doesn't have void client data") );
 
     return DoGetClientData(n);
 }