Smartphone menus.

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index f97606b44a6d33243d85d689cdebdf510fdf69c8..49c1cf07710d631d89bccf6180429286e8d45401 100644 (file)
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "radiobox.h"
 #endif
 
     #pragma interface "radiobox.h"
 #endif
 


@@ -41,6 +41,20 @@ public:
         (void)Create(parent, id, title, pos, size, n, choices, majorDim,
                      style, val, name);
     }
         (void)Create(parent, id, title, pos, size, n, choices, majorDim,
                      style, val, name);
     }

+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 0,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)
+    {
+        (void)Create(parent, id, title, pos, size, choices, majorDim,
+                     style, val, name);
+    }

 
     ~wxRadioBox();
 
 
     ~wxRadioBox();
 


@@ -54,6 +68,16 @@ public:
                 long style = wxRA_HORIZONTAL,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
                 long style = wxRA_HORIZONTAL,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);

+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                int majorDim = 0,
+                long style = wxRA_HORIZONTAL,
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);

 
     // implement the radiobox interface
     virtual void SetSelection(int n);
 
     // implement the radiobox interface
     virtual void SetSelection(int n);


@@ -66,9 +90,9 @@ public:
     virtual int GetColumnCount() const;
     virtual int GetRowCount() const;
 
     virtual int GetColumnCount() const;
     virtual int GetRowCount() const;
 

-    bool Show(bool show);
+    virtual bool Show(bool show = TRUE);

     void SetFocus();
     void SetFocus();

-    bool Enable(bool enable);
+    virtual bool Enable(bool enable = TRUE);

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


@@ -88,7 +112,7 @@ public:
 
     virtual bool SetFont(const wxFont& font);
 
 
     virtual bool SetFont(const wxFont& font);
 

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

     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message,
                                 WXWPARAM wParam, WXLPARAM lParam);
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message,
                                 WXWPARAM wParam, WXLPARAM lParam);


@@ -100,15 +124,13 @@ 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,
-            int n = 0, char **choices = NULL,
-            int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr);
-#endif // WXWIN_COMPATIBILITY
+    virtual void ApplyParentThemeBackground(const wxColour& bg)
+        { SetBackgroundColour(bg); }

 
 protected:
 
 protected:

+    // 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,6 +156,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)

+    DECLARE_NO_COPY_CLASS(wxRadioBox)

 };
 
 #endif
 };
 
 #endif