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

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 8ef4be358a817083aa19f56eb8d676d0ce6b50ed..09ad45314c8f91696af09279b98dacf61092df58 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_


@@ -25,50 +25,50 @@ class WXDLLEXPORT wxBitmap ;
 
 class WXDLLEXPORT wxRadioBox : public wxControl
 {
 
 class WXDLLEXPORT wxRadioBox : public wxControl
 {

-DECLARE_DYNAMIC_CLASS(wxRadioBox)
-
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+        

 public:
     wxRadioBox();
 public:
     wxRadioBox();

-
+    

     wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
     wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,

-            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            int majorDim = 0, long style = wxRA_HORIZONTAL,
-            const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
+        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        int majorDim = 0, long style = wxRA_HORIZONTAL,
+        const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)

     {
         Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
     }
     {
         Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
     }

-
+    

     ~wxRadioBox();
     ~wxRadioBox();

-
+    

     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,

-            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            int majorDim = 0, long style = wxRA_HORIZONTAL,
-            const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
-
+        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        int majorDim = 0, long style = wxRA_HORIZONTAL,
+        const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
+    

     int FindString(const wxString& s) const;
     void SetSelection(int N);
     int GetSelection() const;
     wxString GetString(int N) const;
     int FindString(const wxString& s) const;
     void SetSelection(int N);
     int GetSelection() const;
     wxString GetString(int N) const;

-
+    

     void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
     void SetLabel(int item, const wxString& label) ;
     wxString GetLabel(int item) const;
     wxString GetLabel() const { return wxControl::GetLabel(); };
     void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
     void SetLabel(int item, const wxString& label) ;
     wxString GetLabel(int item) const;
     wxString GetLabel() const { return wxControl::GetLabel(); };

-    void Enable(bool enable);
+    bool Enable(bool enable);

     void Enable(int item, bool enable);
     void Show(int item, bool show) ;
     bool Show(bool show) ;
     void Enable(int item, bool enable);
     void Show(int item, bool show) ;
     bool Show(bool show) ;

-
+    

     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection(const wxString& s);
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection(const wxString& s);

-    virtual int Number() const { return m_noItems; } ;
+    virtual int GetCount() const { return m_noItems; } ;

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

-
+    

     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }

-
+    

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


@@ -78,23 +78,23 @@ public:
     WXWidget GetFrameWidget() const { return m_frameWidget; }
     inline WXWidget* GetRadioButtons() const { return m_radioButtons; }
     inline void SetSel(int i) { m_selectedButton = i; }
     WXWidget GetFrameWidget() const { return m_frameWidget; }
     inline WXWidget* GetRadioButtons() const { return m_radioButtons; }
     inline void SetSel(int i) { m_selectedButton = i; }

-
+    

 protected:
     int               m_majorDim ;
     int               m_noItems;
     int               m_noRowsOrCols;
     int               m_selectedButton;
 protected:
     int               m_majorDim ;
     int               m_noItems;
     int               m_noRowsOrCols;
     int               m_selectedButton;

-
+    

     WXWidget          m_formWidget;
     WXWidget          m_labelWidget;
     WXWidget          m_frameWidget;
     WXWidget*         m_radioButtons;
     wxString*         m_radioButtonLabels;
     WXWidget          m_formWidget;
     WXWidget          m_labelWidget;
     WXWidget          m_frameWidget;
     WXWidget*         m_radioButtons;
     wxString*         m_radioButtonLabels;

-
+    

     virtual void DoSetSize(int x, int y,
     virtual void DoSetSize(int x, int y,

-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);

 };
 
 #endif
 };
 
 #endif

-    // _WX_RADIOBOX_H_
+// _WX_RADIOBOX_H_