Application of the most recent wxWebView patch, the only changes were so tab to space...

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index f7b902f61952577af0d0dd4cc1cb75c7b724e773..e6e1c1ae1060f335e982691ced7bb2da9af7e23f 100644 (file)
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -14,13 +14,13 @@
 
 #include "wx/statbox.h"
 
 
 #include "wx/statbox.h"
 

-class WXDLLEXPORT wxSubwindows;
+class WXDLLIMPEXP_FWD_CORE wxSubwindows;

 
 // ----------------------------------------------------------------------------
 // wxRadioBox
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxRadioBox
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxRadioBox : public wxStaticBox, public wxRadioBoxBase
+class WXDLLIMPEXP_CORE wxRadioBox : public wxStaticBox, public wxRadioBoxBase

 {
 public:
     wxRadioBox() { Init(); }
 {
 public:
     wxRadioBox() { Init(); }


@@ -32,7 +32,7 @@ public:
                const wxSize& size = wxDefaultSize,
                int n = 0, const wxString choices[] = NULL,
                int majorDim = 0,
                const wxSize& size = wxDefaultSize,
                int n = 0, const wxString choices[] = NULL,
                int majorDim = 0,

-               long style = wxRA_HORIZONTAL,
+               long style = wxRA_SPECIFY_COLS,

                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {


@@ -49,7 +49,7 @@ public:
                const wxSize& size,
                const wxArrayString& choices,
                int majorDim = 0,
                const wxSize& size,
                const wxArrayString& choices,
                int majorDim = 0,

-               long style = wxRA_HORIZONTAL,
+               long style = wxRA_SPECIFY_COLS,

                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {


@@ -59,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,


@@ -68,7 +68,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
                 int majorDim = 0,
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
                 int majorDim = 0,

-                long style = wxRA_HORIZONTAL,
+                long style = wxRA_SPECIFY_COLS,

                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
     bool Create(wxWindow *parent,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
     bool Create(wxWindow *parent,


@@ -78,20 +78,21 @@ public:
                 const wxSize& size,
                 const wxArrayString& choices,
                 int majorDim = 0,
                 const wxSize& size,
                 const wxArrayString& choices,
                 int majorDim = 0,

-                long style = wxRA_HORIZONTAL,
+                long style = wxRA_SPECIFY_COLS,

                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
     // implement the radiobox interface
     virtual void SetSelection(int n);
     virtual int GetSelection() const { return m_selectedButton; }
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
     // 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 bool Show(int n, bool show = true);
-    virtual bool IsItemEnabled(int n) const;
-    virtual bool IsItemShown(int n) const;
+    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;
+    virtual int GetItemFromPoint(const wxPoint& pt) const;

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


@@ -99,9 +100,25 @@ public:
     virtual void SetFocus();
     virtual bool SetFont(const wxFont& font);
     virtual bool ContainsHWND(WXHWND hWnd) const;
     virtual void SetFocus();
     virtual bool SetFont(const wxFont& font);
     virtual bool ContainsHWND(WXHWND hWnd) const;

+#if wxUSE_TOOLTIPS
+    virtual bool HasToolTips() const;
+#endif // wxUSE_TOOLTIPS
+#if wxUSE_HELP
+    // override virtual function with a platform-independent implementation
+    virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const
+    {
+        return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin );
+    }
+#endif // wxUSE_HELP
+
+    virtual bool Reparent(wxWindowBase *newParent);

 
 

-    // 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(); }
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }

 
     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); }


@@ -110,6 +127,10 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

+    // This function can be used to check if the given radio button HWND
+    // belongs to one of our radio boxes. If it doesn't, NULL is returned.
+    static wxRadioBox *GetFromRadioButtonHWND(WXHWND hwnd);
+

     virtual bool MSWCommand(WXUINT param, WXWORD id);
     void Command(wxCommandEvent& event);
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     void Command(wxCommandEvent& event);
 


@@ -119,9 +140,6 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    // we can't compute our best size before the items are added to the control
-    virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
-

     // subclass one radio button
     void SubclassRadioButton(WXHWND hWndBtn);
 
     // subclass one radio button
     void SubclassRadioButton(WXHWND hWndBtn);
 


@@ -134,19 +152,25 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

+    virtual void DoMoveWindow(int x, int y, int width, int height);

     virtual wxSize DoGetBestSize() const;
 
     virtual wxSize DoGetBestSize() const;
 

+#if wxUSE_TOOLTIPS
+    virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip);
+#endif
+

 #ifndef __WXWINCE__
     virtual WXHRGN MSWGetRegionWithoutChildren();
 #ifndef __WXWINCE__
     virtual WXHRGN MSWGetRegionWithoutChildren();

-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
-                                    WXWPARAM wParam,
-                                    WXLPARAM lParam);

 #endif // __WXWINCE__
 
 
     // the buttons we contain
     wxSubwindows *m_radioButtons;
 
 #endif // __WXWINCE__
 
 
     // the buttons we contain
     wxSubwindows *m_radioButtons;
 

+    // and the special dummy button used only as a tab group boundary
+    WXHWND m_dummyHwnd;
+    wxWindowIDRef m_dummyId;
+

     // array of widths and heights of the buttons, may be wxDefaultCoord if the
     // corresponding quantity should be computed
     int *m_radioWidth;
     // array of widths and heights of the buttons, may be wxDefaultCoord if the
     // corresponding quantity should be computed
     int *m_radioWidth;


@@ -157,7 +181,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)

-    DECLARE_NO_COPY_CLASS(wxRadioBox)
+    wxDECLARE_NO_COPY_CLASS(wxRadioBox);

 };
 
 #endif
 };
 
 #endif