added missing #include <wx/defs.h> (parts of patch 649438)

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 4b4ace5eb02bf59edf6f7b16a887ef63cf41d62f..56705a5780dffcfb3aa296d128e5a1f815a90d7b 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -12,29 +12,27 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "radiobox.h"
 #endif
 
 #include "wx/control.h"
 
 #pragma interface "radiobox.h"
 #endif
 
 #include "wx/control.h"
 

-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)

 
 public:
     wxRadioBox();
 
     wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
 
 public:
     wxRadioBox();
 
     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);
     }


@@ -42,30 +40,30 @@ public:
     ~wxRadioBox();
 
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
     ~wxRadioBox();
 
     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;
 
     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(); };
-    bool Enable(bool enable);
+    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) ;
     void Enable(int item, bool enable);
     void Show(int item, bool show) ;

-    bool Show(bool show) ;
+    virtual bool Show(bool show = TRUE) ;

 
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection(const wxString& s);
     virtual int GetCount() const { return m_noItems; } ;
     void Command(wxCommandEvent& event);
 
 
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection(const wxString& s);
     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,28 +71,24 @@ 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; }
+    WXWidget* GetRadioButtons() const { return m_radioButtons; }
+    void SetSel(int i) { m_selectedButton = i; }
+    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }

 
 protected:
 
 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;
     WXWidget*         m_radioButtons;

+    WXWidget          m_labelWidget;

     wxString*         m_radioButtonLabels;
 
     virtual void DoSetSize(int x, int y,
     wxString*         m_radioButtonLabels;
 
     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_