Disable wxUSE_ENH_METAFILE for wxGTK builds.

[wxWidgets.git] / src / msw / wince / choicece.cpp

diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp
index 0966c4276a2538cc5bb3d90c0db2f2cfd9160760..646458e4cff68aa921a89906a0d35baca49cb797 100644 (file)
--- a/src/msw/wince/choicece.cpp
+++ b/src/msw/wince/choicece.cpp
@@ -6,7 +6,7 @@
 // Created:     29.07.2004
 // RCS-ID:      $Id$
 // Copyright:   (c) Wlodzimierz Skiba
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -34,12 +34,6 @@
 
 #include "wx/spinbutt.h" // for wxSpinnerBestSize
 
-#if wxUSE_EXTENDED_RTTI
-// TODO
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-#endif
-
 #define GetBuddyHwnd()      (HWND)(m_hwndBuddy)
 
 #define IsVertical(wxStyle) ( (wxStyle & wxSP_HORIZONTAL) != wxSP_HORIZONTAL )
@@ -113,7 +107,7 @@ wxChoice *wxChoice::GetChoiceForListBox(WXHWND hwndBuddy)
 
     // sanity check
     wxASSERT_MSG( choice->m_hwndBuddy == hwndBuddy,
-                  _T("wxChoice has incorrect buddy HWND!") );
+                  wxT("wxChoice has incorrect buddy HWND!") );
 
     return choice;
 }
@@ -169,7 +163,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
     sizeText.x -= sizeBtn.x + MARGIN_BETWEEN;
     if ( sizeText.x <= 0 )
     {
-        wxLogDebug(_T("not enough space for wxSpinCtrl!"));
+        wxLogDebug(wxT("not enough space for wxSpinCtrl!"));
     }
 
     wxPoint posBtn(pos);
@@ -186,7 +180,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
     m_hwndBuddy = (WXHWND)::CreateWindowEx
                     (
                      exStyle,                // sunken border
-                     _T("LISTBOX"),          // window class
+                     wxT("LISTBOX"),         // window class
                      NULL,                   // no window title
                      msStyle,                // style (will be shown later)
                      pos.x, pos.y,           // position
@@ -252,7 +246,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)GetBuddyHwnd(), 0);
 
     // do it after finishing with m_hwndBuddy creation to avoid generating
-    // initial wxEVT_COMMAND_TEXT_UPDATED message
+    // initial wxEVT_TEXT message
     ms_allChoiceSpins.Add(this);
 
     // initialize the controls contents
@@ -309,7 +303,7 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     int n = GetSelection();
     if (n > -1)
     {
-        wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
+        wxCommandEvent event(wxEVT_CHOICE, m_windowId);
         event.SetInt(n);
         event.SetEventObject(this);
         event.SetString(GetStringSelection());
@@ -517,7 +511,7 @@ void wxChoice::DoMoveWindow(int x, int y, int width, int height)
     int widthText = width - widthBtn - MARGIN_BETWEEN;
     if ( widthText <= 0 )
     {
-        wxLogDebug(_T("not enough space for wxSpinCtrl!"));
+        wxLogDebug(wxT("not enough space for wxSpinCtrl!"));
     }
 
     if ( !::MoveWindow(GetBuddyHwnd(), x, y, widthText, height, TRUE) )