Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index bfc72476b1f64376e348c5b0fe3b341c0f4c4961..3736dc4dcf1ad7b35e0d33b9944484b6ecf76914 100644 (file)
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -6,21 +6,20 @@
 // 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 wxRadioBox : public wxControl
@@ -30,13 +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);
-#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,
@@ -55,8 +47,6 @@ public:
             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);
@@ -66,8 +56,6 @@ 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);
     wxString GetLabel(int item) const;
@@ -87,16 +75,27 @@ public:
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
-    // Implementation
+    // implementation only from now on
+    // -------------------------------
+
+    virtual bool SetFont(const wxFont& font);
+
+    long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     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
-    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:
     void SubclassRadioButton(WXHWND hWndBtn);