Reverted semicolons patch

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index 64d4d542cad485fae12d4763ac0761189297c8f2..9470e308cb8cb06030ea814b85cb7459c730b88f 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;
@@ -92,10 +88,10 @@ public:
     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 { return GetNumHor(); }
-    virtual int GetRowCount() const { return GetNumVer(); }
+    virtual bool Enable(int n, bool enable = true);
+    virtual bool Show(int n, bool show = true);
+    virtual bool IsItemEnabled(int n) const;
+    virtual bool IsItemShown(int n) const;
 
     // override some base class methods
     virtual bool Show(bool show = true);
@@ -104,6 +100,9 @@ public:
     virtual bool SetFont(const wxFont& font);
     virtual bool ContainsHWND(WXHWND hWnd) const;
 
+    // we inherit a version returning false from wxStaticBox, override it again
+    virtual bool AcceptsFocus() const { return true; }
+
     void SetLabelFont(const wxFont& WXUNUSED(font)) {}
     void SetButtonFont(const wxFont& font) { SetFont(font); }
 
@@ -116,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();
@@ -141,6 +136,10 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
 
+#ifndef __WXWINCE__
+    virtual WXHRGN MSWGetRegionWithoutChildren();
+#endif // __WXWINCE__
+
 
     // the buttons we contain
     wxSubwindows *m_radioButtons;
@@ -150,10 +149,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;