X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..d42508c2a026d505d39c386b233de4a1b51f1445:/include/wx/msw/radiobox.h

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index 9eac38d4cc..8a98bb0a88 100644
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -6,22 +6,21 @@
 // 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__
-#pragma interface "radiobox.h"
+    #pragma interface "radiobox.h"
 #endif
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr;
 
-// List box item
-class WXDLLEXPORT wxBitmap ;
+class WXDLLEXPORT wxBitmap;
 
 class WXDLLEXPORT wxRadioBox : public wxControl
 {
@@ -30,25 +29,6 @@ class WXDLLEXPORT wxRadioBox : public wxControl
 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);
-
-    /*
-       inline wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
-       int x, int y, int width, int height,
-       int n, wxBitmap **choices,
-       int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr)
-       {
-       Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), n, (const wxBitmap **)choices, majorDim, style,
-       wxDefaultValidator, name);
-       Callback(func);
-       }
-     */
-#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,
@@ -58,17 +38,6 @@ public:
         Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
     }
 
-    /*
-       wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
-       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-       int n = 0, const wxBitmap *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);
-       }
-     */
-
     ~wxRadioBox();
 
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
@@ -77,17 +46,7 @@ public:
             int majorDim = 0, long style = wxRA_HORIZONTAL,
             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
-    /*
-       bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
-       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-       int n = 0, const wxBitmap *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);
@@ -97,38 +56,56 @@ public:
     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) ;
+    void SetLabel(int item, const wxString& label);
+    void SetLabel(int item, wxBitmap *bitmap);
     wxString GetLabel(int item) const;
     bool Show(bool show);
     void SetFocus();
-    void Enable(bool enable);
+    bool Enable(bool enable);
     void Enable(int item, bool enable);
-    void Show(int item, bool show) ;
+    void Show(int item, bool show);
     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; } ;
+    virtual int Number() const { return m_noItems; };
     void Command(wxCommandEvent& event);
 
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
-    // Implementation
-    WXHWND *GetRadioButtons() const { return m_radioButtons; }
-    bool ContainsHWND(WXHWND hWnd) const ;
+    // implementation only from now on
+    // -------------------------------
+
+    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();
+
+    // get the number of buttons per column/row
+    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:
+    void SubclassRadioButton(WXHWND hWndBtn);
+
     WXHWND *          m_radioButtons;
-    int               m_majorDim ;
-    int *             m_radioWidth ;  // for bitmaps
-    int *             m_radioHeight ;
+    int               m_majorDim;
+    int *             m_radioWidth;  // for bitmaps
+    int *             m_radioHeight;
 
     int               m_noItems;
     int               m_noRowsOrCols;