Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

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

diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h
index 1292321fad0b616ca330a241be9124a1c74b05f9..514a731c9033902f3a49d78d6792be4c0d8d1bc7 100644 (file)
--- a/include/wx/motif/radiobut.h
+++ b/include/wx/motif/radiobut.h
@@ -27,28 +27,28 @@ protected:
 public:
     wxRadioButton();
     inline wxRadioButton(wxWindow *parent, wxWindowID id,
 public:
     wxRadioButton();
     inline wxRadioButton(wxWindow *parent, wxWindowID id,

-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxRadioButtonNameStr)
+        const wxString& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxRadioButtonNameStr)

     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }

-
+    

     bool Create(wxWindow *parent, wxWindowID id,
     bool Create(wxWindow *parent, wxWindowID id,

-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxRadioButtonNameStr);
-
+        const wxString& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxRadioButtonNameStr);
+    

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

-
+    

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

-
-// Implementation
+    
+    // Implementation

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


@@ -62,33 +62,33 @@ WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
 
 class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
 {
 
 class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
 {

-  DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
- protected:
-  wxBitmap *theButtonBitmap;
- public:
-  inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
-  inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr);
-
-  virtual void SetLabel(const wxBitmap *label);
-  virtual void SetValue(bool val) ;
-  virtual bool GetValue() const ;
+    DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
+protected:
+    wxBitmap *theButtonBitmap;
+public:
+    inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
+    inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
+        const wxBitmap *label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxBitmapRadioButtonNameStr)
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }
+    
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxBitmap *label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxBitmapRadioButtonNameStr);
+    
+    virtual void SetLabel(const wxBitmap *label);
+    virtual void SetValue(bool val) ;
+    virtual bool GetValue() const ;

 };
 #endif
 
 #endif
 };
 #endif
 
 #endif

-    // _WX_RADIOBUT_H_
+// _WX_RADIOBUT_H_