Added wxTolBar::etMargins

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

diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h
index a115d5befcbee34b0e1fcd8493d504c61a810c41..6a159d529584f184a08abdc1c27b164467b61948 100644 (file)
--- a/include/wx/motif/checkbox.h
+++ b/include/wx/motif/checkbox.h
@@ -44,9 +44,12 @@ class WXDLLEXPORT wxCheckBox: public wxControl
            const wxString& name = wxCheckBoxNameStr);
   virtual void SetValue(bool);
   virtual bool GetValue() const ;
            const wxString& name = wxCheckBoxNameStr);
   virtual void SetValue(bool);
   virtual bool GetValue() const ;

-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  virtual void SetLabel(const wxString& label);

   virtual void Command(wxCommandEvent& event);
   virtual void Command(wxCommandEvent& event);

+
+// Implementation
+  virtual void ChangeFont(bool keepOriginalSize = TRUE);
+  virtual void ChangeBackgroundColour();
+  virtual void ChangeForegroundColour();

 };
 
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 };
 
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox


@@ -72,9 +75,15 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxCheckBoxNameStr);
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxCheckBoxNameStr);

+

   virtual void SetValue(bool);
   virtual bool GetValue() const ;
   virtual void SetValue(bool);
   virtual bool GetValue() const ;

+

   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

+  virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+

   virtual void SetLabel(const wxBitmap *bitmap);
 };
 #endif
   virtual void SetLabel(const wxBitmap *bitmap);
 };
 #endif