Fixed Windows DLL link problems with wxHtmlProcessor

[wxWidgets.git] / include / wx / gtk / checklst.h

diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index 878adc29561e48b584c2feb947bdcb9b818eeb88..11f9980a334c875e66ed984de3793975c85eb27c 100644 (file)
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -2,7 +2,7 @@
 // Name:        checklst.h
 // Purpose:     wxCheckListBox class
 // Author:      Robert Roebling
 // Name:        checklst.h
 // Purpose:     wxCheckListBox class
 // Author:      Robert Roebling

-// Modified by: 
+// Modified by:

 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence


@@ -16,42 +16,53 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_CHECKLISTBOX
+

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/listbox.h"
 
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/listbox.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// there is no "right" choice of the checkbox indicators, so allow the user to
+// define them himself if he wants
+#ifndef wxCHECKLBOX_CHECKED
+    #define wxCHECKLBOX_CHECKED   _T('x')
+    #define wxCHECKLBOX_UNCHECKED _T(' ')

 
 

-class wxCheckListBox;
+    #define wxCHECKLBOX_STRING    _T("[ ] ")
+#endif

 
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxCheckListBox
 // wxCheckListBox

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 class wxCheckListBox : public wxListBox
 {
 
 class wxCheckListBox : public wxListBox
 {

-  DECLARE_DYNAMIC_CLASS(wxCheckListBox)

 public:
 public:

+    wxCheckListBox();
+    wxCheckListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int nStrings = 0,
+            const wxString *choices = (const wxString *)NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr);

 
 

-  wxCheckListBox();
-  wxCheckListBox(wxWindow *parent, wxWindowID id,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 int nStrings = 0, 
-                 const wxString choices[] = NULL,
-                 long style = 0,
-                 const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxListBoxNameStr);
-
-  bool IsChecked( int index ) const;
-  void Check( int index, bool check = TRUE );
-  
-  int GetItemHeight();
+    bool IsChecked( int index ) const;
+    void Check( int index, bool check = TRUE );

 
 

+    int GetItemHeight() const;
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)

 };
 
 };
 

-#endif 
-        //__GTKCHECKLISTH__
+#endif
+
+#endif   //__GTKCHECKLISTH__