X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..9bb50fd0b04c824fc7ba14c0dc4ba4a2a9a1e6ad:/src/motif/checklst.cpp?ds=inline

diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index 7546ec3927..bffaa37ebf 100644
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -13,13 +13,17 @@
 // headers & declarations
 // ============================================================================
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "checklst.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/defs.h"
 
 #include "wx/checklst.h"
+#include "wx/arrstr.h"
 
 // ============================================================================
 // implementation
@@ -54,7 +58,7 @@ static void CopyStringsAddingPrefix(const wxArrayString& orig,
     copy.Clear();
 
     for(size_t i = 0; i < orig.GetCount(); ++i )
-        copy.Add( Prefix(FALSE) + orig[i] );
+        copy.Add( Prefix(false) + orig[i] );
 }
 
 // def ctor: use Create() to really create the control
@@ -74,6 +78,17 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
            style, val, name);
 }
 
+wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
+                               const wxPoint& pos, const wxSize& size,
+                               const wxArrayString& choices,
+                               long style, const wxValidator& val,
+                               const wxString& name)
+                               : wxCheckListBoxBase()
+{
+    Create(parent, id, pos, size, choices,
+           style, val, name);
+}
+
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                             const wxPoint& pos,
                             const wxSize& size,
@@ -88,6 +103,20 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     return retVal;
 }   
 
+bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            const wxArrayString& choices,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name)
+{
+    // wxListBox::Create calls set, which adds the prefixes
+    bool retVal = wxListBox::Create(parent, id, pos, size, choices,
+                                    style, validator, name);
+    return retVal;
+}   
+
 // check items
 // -----------
 
@@ -117,8 +146,8 @@ void wxCheckListBox::DoToggleItem( int n, int x )
             event.SetClientObject( GetClientObject(n) );
         else if( HasClientUntypedData() )
             event.SetClientData( GetClientData(n) );
-        event.m_commandInt = n;
-        event.m_extraLong = TRUE;
+        event.SetInt(n);
+        event.SetExtraLong(true);
         event.SetEventObject(this);
         event.SetString( GetString( n ) );
 
@@ -128,13 +157,13 @@ void wxCheckListBox::DoToggleItem( int n, int x )
 
 int wxCheckListBox::DoAppend(const wxString& item)
 {
-    return wxListBox::DoAppend( Prefix(FALSE) + item );
+    return wxListBox::DoAppend( Prefix(false) + item );
 }
 
 int wxCheckListBox::FindString(const wxString& s) const
 {
-    int n1 = wxListBox::FindString(Prefix(FALSE) + s);
-    int n2 = wxListBox::FindString(Prefix(TRUE) + s);
+    int n1 = wxListBox::FindString(Prefix(false) + s);
+    int n2 = wxListBox::FindString(Prefix(true) + s);
     int min = wxMin(n1, n2), max = wxMax(n1, n2);
 
     // why this works: