wxMSW compilation fix for wxCompositeWindow.

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

diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index a90b95b29988610c795c599e55f2299165f0ebe4..a66adfa215481649827fd6ebf79d2d32e9596988 100644 (file)
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_RADIOBOX_H_
 #define _WX_UNIV_RADIOBOX_H_
 
 #ifndef _WX_UNIV_RADIOBOX_H_
 #define _WX_UNIV_RADIOBOX_H_
 

-class WXDLLEXPORT wxRadioButton;
+class WXDLLIMPEXP_FWD_CORE wxRadioButton;

 
 #include "wx/statbox.h"
 #include "wx/dynarray.h"
 
 #include "wx/statbox.h"
 #include "wx/dynarray.h"


@@ -23,7 +23,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxRadioButton *, wxArrayRadioButtons);
 // wxRadioBox: a box full of radio buttons
 // ----------------------------------------------------------------------------
 
 // wxRadioBox: a box full of radio buttons
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxRadioBox : public wxStaticBox,
+class WXDLLIMPEXP_CORE wxRadioBox : public wxStaticBox,

                                public wxRadioBoxBase
 {
 public:
                                public wxRadioBoxBase
 {
 public:


@@ -84,15 +84,17 @@ public:
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 

-    virtual int GetCount() const { return (int) m_buttons.GetCount(); }
-    virtual int GetColumnCount() const { return m_numCols; }
-    virtual int GetRowCount() const { return m_numRows; }
+    virtual unsigned int GetCount() const
+        { return (unsigned int)m_buttons.GetCount(); }

 
 

-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& label);
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& label);

 
 

-    virtual bool Enable(int n, bool enable = true);
-    virtual bool Show(int n, bool show = true);
+    virtual bool Enable(unsigned int n, bool enable = true);
+    virtual bool Show(unsigned int n, bool show = true);
+
+    virtual bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) const;

 
     // we also override the wxControl methods to avoid virtual function hiding
     virtual bool Enable(bool enable = true);
 
     // we also override the wxControl methods to avoid virtual function hiding
     virtual bool Enable(bool enable = true);


@@ -100,8 +102,9 @@ public:
     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label);
 
     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label);
 

-    // we inherit a version returning false from wxStaticBox, override it again
-    virtual bool AcceptsFocus() const { return true; }
+    // we inherit a version always returning false from wxStaticBox, override
+    // it to behave normally
+    virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }

 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );


@@ -117,6 +120,8 @@ public:
     bool OnKeyDown(wxKeyEvent& event);
 
 protected:
     bool OnKeyDown(wxKeyEvent& event);
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // override the base class methods dealing with window positioning/sizing
     // as we must move/size the buttons as well
     virtual void DoMoveWindow(int x, int y, int width, int height);
     // override the base class methods dealing with window positioning/sizing
     // as we must move/size the buttons as well
     virtual void DoMoveWindow(int x, int y, int width, int height);


@@ -128,24 +133,12 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    // sets m_majorDim and calculate m_numCols and m_numRows
-    void SetMajorDim(int majorDim);
-

     // calculate the max size of all buttons
     wxSize GetMaxButtonSize() const;
 
     // the currently selected radio button or -1
     int m_selection;
 
     // calculate the max size of all buttons
     wxSize GetMaxButtonSize() const;
 
     // the currently selected radio button or -1
     int m_selection;
 

-    // the parameters defining the button layout: majorDim meaning depends on
-    // the style and is the (max) number of columns if it includes
-    // wxRA_SPECIFY_COLS and is the (max) number of rows if it includes
-    // wxRA_SPECIFY_ROWS - the number of rows and columns is calculated from
-    // it
-    int m_majorDim,
-        m_numCols,
-        m_numRows;
-

     // all radio buttons
     wxArrayRadioButtons m_buttons;
 
     // all radio buttons
     wxArrayRadioButtons m_buttons;