added Remove(HWND); removed unused wParam parameter from SendTooltipMessage

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index ac8dac414d8a18be71aaa0cd7f9d5fc5a424e701..c02598fa6ca3e5ca393f9c8e3cbd62c4ac35c0ff 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_
 
 #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;
 #include "wx/statbox.h"
 
 class WXDLLEXPORT wxSubwindows;


@@ -63,7 +59,7 @@ public:
                      style, val, name);
     }
 
                      style, val, name);
     }
 

-    ~wxRadioBox();
+    virtual ~wxRadioBox();

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -89,13 +85,13 @@ public:
     // implement the radiobox interface
     virtual void SetSelection(int n);
     virtual int GetSelection() const { return m_selectedButton; }
     // implement the radiobox interface
     virtual void SetSelection(int n);
     virtual int GetSelection() const { return m_selectedButton; }

-    virtual int GetCount() const;
-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& label);
-    virtual bool 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 unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& label);
+    virtual bool Enable(unsigned int n, bool enable = true);
+    virtual bool Show(unsigned int n, bool show = true);
+    virtual bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) const;

 
     // override some base class methods
     virtual bool Show(bool show = true);
 
     // override some base class methods
     virtual bool Show(bool show = true);


@@ -104,8 +100,9 @@ public:
     virtual bool SetFont(const wxFont& font);
     virtual bool ContainsHWND(WXHWND hWnd) const;
 
     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; }
+    // we inherit a version always returning false from wxStaticBox, override
+    // it to behave normally
+    virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }

 
     void SetLabelFont(const wxFont& WXUNUSED(font)) {}
     void SetButtonFont(const wxFont& font) { SetFont(font); }
 
     void SetLabelFont(const wxFont& WXUNUSED(font)) {}
     void SetButtonFont(const wxFont& font) { SetFont(font); }


@@ -119,10 +116,6 @@ public:
 
     void SendNotificationEvent();
 
 
     void SendNotificationEvent();
 

-    // get the number of buttons per column/row
-    int GetNumVer() const;
-    int GetNumHor() const;
-

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -144,6 +137,10 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
 
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
 

+#ifndef __WXWINCE__
+    virtual WXHRGN MSWGetRegionWithoutChildren();
+#endif // __WXWINCE__
+

 
     // the buttons we contain
     wxSubwindows *m_radioButtons;
 
     // the buttons we contain
     wxSubwindows *m_radioButtons;


@@ -153,10 +150,6 @@ protected:
     int *m_radioWidth;
     int *m_radioHeight;
 
     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;
 
     // currently selected button or wxNOT_FOUND if none
     int m_selectedButton;