X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d08943ee49205d7d184a514cdd40de182aaa1eb..8008807eb1ac9f3a5a20c77758b53896f44c5017:/include/wx/msw/radiobox.h

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index 4b2dc0b5fd..89673b211f 100644
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -16,16 +16,18 @@
     #pragma interface "radiobox.h"
 #endif
 
-class WXDLLEXPORT wxBitmap;
+#include "wx/statbox.h"
+
+class WXDLLEXPORT wxSubwindows;
 
 // ----------------------------------------------------------------------------
 // wxRadioBox
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
+class WXDLLEXPORT wxRadioBox : public wxStaticBox, public wxRadioBoxBase
 {
 public:
-    wxRadioBox();
+    wxRadioBox() { Init(); }
 
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
@@ -38,9 +40,12 @@ public:
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
+        Init();
+
         (void)Create(parent, id, title, pos, size, n, choices, majorDim,
                      style, val, name);
     }
+
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
@@ -52,6 +57,8 @@ public:
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
+        Init();
+
         (void)Create(parent, id, title, pos, size, choices, majorDim,
                      style, val, name);
     }
@@ -81,53 +88,45 @@ public:
 
     // implement the radiobox interface
     virtual void SetSelection(int n);
-    virtual int GetSelection() const;
+    virtual int GetSelection() const { return m_selectedButton; }
     virtual int GetCount() const;
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);
     virtual void Enable(int n, bool enable = true);
     virtual void Show(int n, bool show = true);
-    virtual int GetColumnCount() const;
-    virtual int GetRowCount() const;
+    virtual int GetColumnCount() const { return GetNumHor(); }
+    virtual int GetRowCount() const { return GetNumVer(); }
 
+    // override some base class methods
     virtual bool Show(bool show = true);
-    void SetFocus();
     virtual bool Enable(bool enable = true);
-    void SetLabelFont(const wxFont& WXUNUSED(font)) {};
-    void SetButtonFont(const wxFont& font) { SetFont(font); }
+    virtual void SetFocus();
+    virtual bool SetFont(const wxFont& font);
+    virtual bool ContainsHWND(WXHWND hWnd) const;
 
-    void Command(wxCommandEvent& event);
+    // we inherit a version returning false from wxStaticBox, override it again
+    virtual bool AcceptsFocus() const { return true; }
+
+    void SetLabelFont(const wxFont& WXUNUSED(font)) {}
+    void SetButtonFont(const wxFont& font) { SetFont(font); }
 
-    int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
-    void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     // implementation only from now on
     // -------------------------------
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
+    void Command(wxCommandEvent& event);
 
-    // FIXME: are they used? missing "Do" prefix?
-    void GetSize(int *x, int *y) const;
-    void GetPosition(int *x, int *y) const;
-
-    virtual bool SetFont(const wxFont& font);
-
-    WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message,
-                                WXWPARAM wParam, WXLPARAM lParam);
-    WXHWND *GetRadioButtons() const { return m_radioButtons; }
-    bool ContainsHWND(WXHWND hWnd) const;
     void SendNotificationEvent();
 
     // get the number of buttons per column/row
     int GetNumVer() const;
     int GetNumHor() const;
 
-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
-
 protected:
+    // common part of all ctors
+    void Init();
+
     // we can't compute our best size before the items are added to the control
     virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
 
@@ -140,20 +139,27 @@ protected:
     // get the total size occupied by the radio box buttons
     wxSize GetTotalButtonSize(const wxSize& sizeBtn) const;
 
-    WXHWND *          m_radioButtons;
-    int               m_majorDim;
-    int *             m_radioWidth;  // for bitmaps
-    int *             m_radioHeight;
-
-    int               m_noItems;
-    int               m_noRowsOrCols;
-    int               m_selectedButton;
-
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
 
+
+    // the buttons we contain
+    wxSubwindows *m_radioButtons;
+
+    // array of widths and heights of the buttons, may be wxDefaultCoord if the
+    // corresponding quantity should be computed
+    int *m_radioWidth;
+    int *m_radioHeight;
+
+    // the number of elements in major dimension (i.e. number of columns if
+    // wxRA_SPECIFY_COLS or the number of rows if wxRA_SPECIFY_ROWS)
+    int m_majorDim;
+
+    // currently selected button or wxNOT_FOUND if none
+    int m_selectedButton;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
     DECLARE_NO_COPY_CLASS(wxRadioBox)