move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 47a4e356d503f5da57a9c7d4d7bed5ed7cefe0a4..8b0348fe374dd609f5376a94dd6a8635f573897b 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 char) 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


@@ -99,18 +99,27 @@ public:
         DoSet3StateValue(state);
     }
 
         DoSet3StateValue(state);
     }
 

-    bool Is3State() const
+    bool Is3State() const { return HasFlag(wxCHK_3STATE); }
+
+    bool Is3rdStateAllowedForUser() const

     {
     {

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

     }
 
     }
 

-    bool Is3rdStateAllowedForUser() const
+    virtual bool HasTransparentBackground() { return true; }
+
+    // wxCheckBox-specific processing after processing the update event
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event)

     {
     {

-        return (m_style & wxCHK_ALLOW_3RD_STATE_FOR_USER) != 0;
+        wxControl::DoUpdateWindowUI(event);
+
+        if ( event.GetSetChecked() )
+            SetValue(event.GetChecked());

     }
 
 protected:
     }
 
 protected:

-    int m_style;
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

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


@@ -130,14 +139,18 @@ private:
     #include "wx/msw/checkbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/checkbox.h"
     #include "wx/msw/checkbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/checkbox.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/checkbox.h"
     #include "wx/gtk/checkbox.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/checkbox.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/checkbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checkbox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/checkbox.h"
 #elif defined(__WXCOCOA__)
     #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