reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index bfc72476b1f64376e348c5b0fe3b341c0f4c4961..f97606b44a6d33243d85d689cdebdf510fdf69c8 100644 (file)
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -1,106 +1,123 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.h
+// Name:        wx/msw/radiobox.h

 // Purpose:     wxRadioBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxRadioBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifdef __GNUG__

-#pragma interface "radiobox.h"
+    #pragma interface "radiobox.h"

 #endif
 
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
-
-// List box item

 class WXDLLEXPORT wxBitmap;
 
 class WXDLLEXPORT wxBitmap;
 

-class WXDLLEXPORT wxRadioBox : public wxControl
-{
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+// ----------------------------------------------------------------------------
+// wxRadioBox
+// ----------------------------------------------------------------------------

 
 

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

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

-#if WXWIN_COMPATIBILITY
-    wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
-            int x = -1, int y = -1, int width = -1, int height = -1,
-            int n = 0, char **choices = NULL,
-            int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr);
-#endif // WXWIN_COMPATIBILITY
-
-    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)
+    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)

     {
     {

-        Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
+        (void)Create(parent, id, title, pos, size, n, choices, majorDim,
+                     style, val, name);

     }
 
     ~wxRadioBox();
 
     }
 
     ~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);
-
-    virtual bool MSWCommand(WXUINT param, WXWORD id);
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
-    int FindString(const wxString& s) const;
-    void SetSelection(int N);
-    int GetSelection() const;
-    wxString GetString(int N) const;
+    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);
+
+    // implement the radiobox interface
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;
+    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;

 
 

-    void GetSize(int *x, int *y) const;
-    void GetPosition(int *x, int *y) const;
-
-    wxString GetLabel() const;
-    void SetLabel(const wxString& label);
-    void SetLabel(int item, const wxString& label);
-    void SetLabel(int item, wxBitmap *bitmap);
-    wxString GetLabel(int item) const;

     bool Show(bool show);
     void SetFocus();
     bool Enable(bool enable);
     bool Show(bool show);
     void SetFocus();
     bool Enable(bool enable);

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

     void SetLabelFont(const wxFont& WXUNUSED(font)) {};
     void SetButtonFont(const wxFont& font) { SetFont(font); }
 
     void SetLabelFont(const wxFont& WXUNUSED(font)) {};
     void SetButtonFont(const wxFont& font) { SetFont(font); }
 

-    virtual wxString GetStringSelection() const;
-    virtual bool SetStringSelection(const wxString& s);
-    virtual int Number() const { return m_noItems; };

     void Command(wxCommandEvent& event);
 
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     void Command(wxCommandEvent& event);
 
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 

-    // Implementation
+    // implementation only from now on
+    // -------------------------------
+
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+
+    // 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);
+
+    long 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();
 
     WXHWND *GetRadioButtons() const { return m_radioButtons; }
     bool ContainsHWND(WXHWND hWnd) const;
     void SendNotificationEvent();
 

-    long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-

     // get the number of buttons per column/row
     // get the number of buttons per column/row

-    inline int GetNumVer() const;
-    inline int GetNumHor() const;
+    int GetNumVer() const;
+    int GetNumHor() const;
+
+    // compatibility ctor
+#if WXWIN_COMPATIBILITY
+    wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
+            int x = -1, int y = -1, int width = -1, int height = -1,
+            int n = 0, char **choices = NULL,
+            int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr);
+#endif // WXWIN_COMPATIBILITY

 
 protected:
 
 protected:

+    // subclass one radio button

     void SubclassRadioButton(WXHWND hWndBtn);
 
     void SubclassRadioButton(WXHWND hWndBtn);
 

+    // get the max size of radio buttons
+    wxSize GetMaxButtonSize() const;
+
+    // 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
     WXHWND *          m_radioButtons;
     int               m_majorDim;
     int *             m_radioWidth;  // for bitmaps


@@ -113,6 +130,10 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)

 };
 
 #endif
 };
 
 #endif