don't test for __WIN95__ which doesn't exist any more; don't do compiler checks here...

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index 2658783a362b9072f10ca777080b8966225ecdb7..f7b902f61952577af0d0dd4cc1cb75c7b724e773 100644 (file)
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "radiobox.h"
-#endif
-
 #include "wx/statbox.h"
 
 class WXDLLEXPORT wxSubwindows;
@@ -94,8 +90,8 @@ public:
     virtual void SetString(int n, const wxString& label);
     virtual bool Enable(int n, bool enable = true);
     virtual bool Show(int n, bool show = true);
-    virtual int GetColumnCount() const { return GetNumHor(); }
-    virtual int GetRowCount() const { return GetNumVer(); }
+    virtual bool IsItemEnabled(int n) const;
+    virtual bool IsItemShown(int n) const;
 
     // override some base class methods
     virtual bool Show(bool show = true);
@@ -119,10 +115,6 @@ public:
 
     void SendNotificationEvent();
 
-    // get the number of buttons per column/row
-    int GetNumVer() const;
-    int GetNumHor() const;
-
 protected:
     // common part of all ctors
     void Init();
@@ -144,6 +136,13 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
 
+#ifndef __WXWINCE__
+    virtual WXHRGN MSWGetRegionWithoutChildren();
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
+                                    WXWPARAM wParam,
+                                    WXLPARAM lParam);
+#endif // __WXWINCE__
+
 
     // the buttons we contain
     wxSubwindows *m_radioButtons;
@@ -153,10 +152,6 @@ protected:
     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;