Put wxEVT_SCROLL_CHANGED and wxEVT_SCROLL_ENDSCROLL inside

[wxWidgets.git] / include / wx / checkbox.h

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index ac034b8e12c871b08c16e34a5e082d90ffbdaddd..9f9b5e83d9c072b1b7369923bf0200dabc60e7c0 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -49,7 +49,7 @@ enum wxCheckBoxState
 };
 
 
 };
 
 

-WXDLLEXPORT_DATA(extern const wxChar *) wxCheckBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr;

 
 // ----------------------------------------------------------------------------
 // wxCheckBox: a control which shows a label and a box which may be checked
 
 // ----------------------------------------------------------------------------
 // wxCheckBox: a control which shows a label and a box which may be checked


@@ -61,7 +61,7 @@ public:
     wxCheckBoxBase() { }
 
     // set/get the checked status of the listbox
     wxCheckBoxBase() { }
 
     // set/get the checked status of the listbox

-    virtual void SetValue(const bool value) = 0;
+    virtual void SetValue(bool value) = 0;

     virtual bool GetValue() const = 0;
 
     bool IsChecked() const
     virtual bool GetValue() const = 0;
 
     bool IsChecked() const


@@ -99,19 +99,16 @@ public:
         DoSet3StateValue(state);
     }
 
         DoSet3StateValue(state);
     }
 

-    bool Is3State() const
-    {
-        return (m_style & wxCHK_3STATE) != 0;
-    }
+    bool Is3State() const { return HasFlag(wxCHK_3STATE); }

 
     bool Is3rdStateAllowedForUser() const
     {
 
     bool Is3rdStateAllowedForUser() const
     {

-        return (m_style & wxCHK_ALLOW_3RD_STATE_FOR_USER) != 0;
+        return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);

     }
 
     }
 

-protected:
-    int m_style;
+    virtual bool HasTransparentBackground() { return true; }

 
 

+protected:

     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
     virtual wxCheckBoxState DoGet3StateValue() const
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
     virtual wxCheckBoxState DoGet3StateValue() const


@@ -138,6 +135,8 @@ private:
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checkbox.h"
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checkbox.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/checkbox.h"

 #endif
 
 #endif // wxUSE_CHECKBOX
 #endif
 
 #endif // wxUSE_CHECKBOX