gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index b867313031f4495a9fda60be38572c9c1ca96902..8a98bb0a88b5e85a26e3b81949fa5127d67ba6f5 100644 (file)
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -47,8 +47,6 @@ public:
             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
             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 FindString(const wxString& s) const;
     void SetSelection(int N);


@@ -80,6 +78,11 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // 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();
     WXHWND *GetRadioButtons() const { return m_radioButtons; }
     bool ContainsHWND(WXHWND hWnd) const;
     void SendNotificationEvent();


@@ -88,6 +91,7 @@ public:
     int GetNumVer() const;
     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,
 #if WXWIN_COMPATIBILITY
     wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
             int x = -1, int y = -1, int width = -1, int height = -1,