Applied patch [ 670782 ] Combobox uses popup window width

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 591f88e21c4d398c393969b3d2d52a83e0fbffce..bf7c100c4616f875e8c4fef5aa252ce86096c76e 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -23,7 +23,7 @@ WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
 // List box item
 class WXDLLEXPORT wxBitmap ;
 
 // List box item
 class WXDLLEXPORT wxBitmap ;
 

-class WXDLLEXPORT wxRadioBox : public wxControl
+class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase

 {
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 
 {
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 


@@ -50,12 +50,9 @@ public:
     int FindString(const wxString& s) const;
     void SetSelection(int N);
     int GetSelection() 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 SetString(int item, const wxString& label) ;
+    wxString GetString(int item) const;

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


@@ -66,6 +63,9 @@ public:
     virtual int GetCount() const { return m_noItems; } ;
     void Command(wxCommandEvent& event);
 
     virtual int GetCount() const { return m_noItems; } ;
     void Command(wxCommandEvent& event);
 

+    int GetColumnCount() const;
+    int GetRowCount() const;
+

     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; }
 


@@ -73,21 +73,15 @@ public:
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

-    WXWidget GetTopWidget() const { return m_formWidget; }
-    WXWidget GetLabelWidget() const { return m_labelWidget; }
-    WXWidget GetFrameWidget() const { return m_frameWidget; }

     inline WXWidget* GetRadioButtons() const { return m_radioButtons; }
     inline void SetSel(int i) { m_selectedButton = i; }
 
 protected:
     inline WXWidget* GetRadioButtons() const { return m_radioButtons; }
     inline void SetSel(int i) { m_selectedButton = i; }
 
 protected:

-    int               m_majorDim ;
+    int               m_majorDim;

     int               m_noItems;
     int               m_noRowsOrCols;
     int               m_selectedButton;
 
     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_radioButtons;
     wxString*         m_radioButtonLabels;