Extract compiler-specific macro definitions in a new wx/compiler.h.

[wxWidgets.git] / samples / combo / combo.cpp

diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index 419c3e03597a23bd1a440b8a698bb2a3d554add7..ac8eba01437bf46f8630dcd8e1f472dea0422cef 100644 (file)
--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@@ -189,29 +189,29 @@ public:
         r.Deflate(3);
         r.height -= 2;
 
-        int penStyle = wxSOLID;
+        wxPenStyle penStyle = wxPENSTYLE_SOLID;
         if ( item == 1 )
-            penStyle = wxTRANSPARENT;
+            penStyle = wxPENSTYLE_TRANSPARENT;
         else if ( item == 2 )
-            penStyle = wxDOT;
+            penStyle = wxPENSTYLE_DOT;
         else if ( item == 3 )
-            penStyle = wxLONG_DASH;
+            penStyle = wxPENSTYLE_LONG_DASH;
         else if ( item == 4 )
-            penStyle = wxSHORT_DASH;
+            penStyle = wxPENSTYLE_SHORT_DASH;
         else if ( item == 5 )
-            penStyle = wxDOT_DASH;
+            penStyle = wxPENSTYLE_DOT_DASH;
         else if ( item == 6 )
-            penStyle = wxBDIAGONAL_HATCH;
+            penStyle = wxPENSTYLE_BDIAGONAL_HATCH;
         else if ( item == 7 )
-            penStyle = wxCROSSDIAG_HATCH;
+            penStyle = wxPENSTYLE_CROSSDIAG_HATCH;
         else if ( item == 8 )
-            penStyle = wxFDIAGONAL_HATCH;
+            penStyle = wxPENSTYLE_FDIAGONAL_HATCH;
         else if ( item == 9 )
-            penStyle = wxCROSS_HATCH;
+            penStyle = wxPENSTYLE_CROSS_HATCH;
         else if ( item == 10 )
-            penStyle = wxHORIZONTAL_HATCH;
+            penStyle = wxPENSTYLE_HORIZONTAL_HATCH;
         else if ( item == 11 )
-            penStyle = wxVERTICAL_HATCH;
+            penStyle = wxPENSTYLE_VERTICAL_HATCH;
 
         wxPen pen( dc.GetTextForeground(), 3, penStyle );
 
@@ -939,15 +939,15 @@ void MyFrame::OnComboBoxUpdate( wxCommandEvent& event )
     if ( !event.GetEventObject()->IsKindOf(CLASSINFO(wxComboCtrl)) )
         return;
 
-    if ( event.GetEventType() == wxEVT_COMMAND_COMBOBOX_SELECTED )
+    if ( event.GetEventType() == wxEVT_COMBOBOX )
     {
         wxLogDebug(wxT("EVT_COMBOBOX(id=%i,selection=%i)"),event.GetId(),event.GetSelection());
     }
-    else if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
+    else if ( event.GetEventType() == wxEVT_TEXT )
     {
         wxLogDebug(wxT("EVT_TEXT(id=%i,string=\"%s\")"),event.GetId(),event.GetString().c_str());
     }
-    else if ( event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER )
+    else if ( event.GetEventType() == wxEVT_TEXT_ENTER )
     {
         wxLogDebug("EVT_TEXT_ENTER(id=%i,string=\"%s\")",
                    event.GetId(), event.GetString().c_str());