Applied patch [ 1181975 ] [wxMSW] Removes all flicker from wxNotebook

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

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index d6fe35c359ff6f41753c12d122668f4a38b914a6..955dc12e4236f425f1a54ad32cf2c40a441e9da9 100644 (file)
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -12,8 +12,6 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 

-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
-

 // List box item
 class WXDLLEXPORT wxBitmap ;
 
 // List box item
 class WXDLLEXPORT wxBitmap ;
 


@@ -31,9 +29,7 @@ public:
                       ,const wxString     asChoices[] = NULL
                       ,int                nMajorDim = 0
                       ,long               lStyle = wxRA_HORIZONTAL
                       ,const wxString     asChoices[] = NULL
                       ,int                nMajorDim = 0
                       ,long               lStyle = wxRA_HORIZONTAL

-#if wxUSE_VALIDATORS

                       ,const wxValidator& rVal = wxDefaultValidator
                       ,const wxValidator& rVal = wxDefaultValidator

-#endif

                       ,const wxString&    rsName = wxRadioBoxNameStr
                      )
     {
                       ,const wxString&    rsName = wxRadioBoxNameStr
                      )
     {


@@ -46,9 +42,32 @@ public:
                ,asChoices
                ,nMajorDim
                ,lStyle
                ,asChoices
                ,nMajorDim
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rVal
                ,rVal

-#endif
+               ,rsName
+              );
+    }
+
+    inline wxRadioBox( wxWindow*            pParent
+                      ,wxWindowID           vId
+                      ,const wxString&      rsTitle
+                      ,const wxPoint&       rPos
+                      ,const wxSize&        rSize
+                      ,const wxArrayString& asChoices
+                      ,int                  nMajorDim = 0
+                      ,long                 lStyle = wxRA_HORIZONTAL
+                      ,const wxValidator&   rVal = wxDefaultValidator
+                      ,const wxString&      rsName = wxRadioBoxNameStr
+                     )
+    {
+        Create( pParent
+               ,vId
+               ,rsTitle
+               ,rPos
+               ,rSize
+               ,asChoices
+               ,nMajorDim
+               ,lStyle
+               ,rVal

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -64,18 +83,26 @@ public:
                 ,const wxString     asChoices[] = NULL
                 ,int                nMajorDim = 0
                 ,long               lStyle = wxRA_HORIZONTAL
                 ,const wxString     asChoices[] = NULL
                 ,int                nMajorDim = 0
                 ,long               lStyle = wxRA_HORIZONTAL

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rVal = wxDefaultValidator
                 ,const wxValidator& rVal = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxRadioBoxNameStr
                );
 
                 ,const wxString&    rsName = wxRadioBoxNameStr
                );
 

+    bool Create( wxWindow*            pParent
+                ,wxWindowID           vId
+                ,const wxString&      rsTitle
+                ,const wxPoint&       rPos
+                ,const wxSize&        rSize
+                ,const wxArrayString& asChoices
+                ,int                  nMajorDim = 0
+                ,long                 lStyle = wxRA_HORIZONTAL
+                ,const wxValidator&   rVal = wxDefaultValidator
+                ,const wxString&      rsName = wxRadioBoxNameStr
+               );
+

     void             Command(wxCommandEvent& rEvent);
     bool             ContainsHWND(WXHWND hWnd) const;
     void             Command(wxCommandEvent& rEvent);
     bool             ContainsHWND(WXHWND hWnd) const;

-    bool             Enable(bool bEnable);
-    void             Enable( int  nItem
-                            ,bool bEnable
-                           );
+    virtual bool     Enable(bool bEnable = true);
+    virtual bool     Enable(int  nItem, bool bEnable = true);

     int              FindString(const wxString& sStr) const;
 
     virtual WXHBRUSH OnCtlColor( WXHDC    hDC
     int              FindString(const wxString& sStr) const;
 
     virtual WXHBRUSH OnCtlColor( WXHDC    hDC


@@ -89,10 +116,8 @@ public:
                                 ,WXWORD wId
                                );
     void             SendNotificationEvent(void);
                                 ,WXWORD wId
                                );
     void             SendNotificationEvent(void);

-    void             Show( int  nItem
-                          ,bool bShow =  TRUE
-                         ) ;
-    bool             Show(bool bShow);
+    virtual bool     Show(int  nItem, bool bShow = true);
+    virtual bool     Show(bool bShow = true);

     MRESULT          WindowProc( WXUINT   uMsg
                                 ,WXWPARAM wParam
                                 ,WXLPARAM lParam
     MRESULT          WindowProc( WXUINT   uMsg
                                 ,WXWPARAM wParam
                                 ,WXLPARAM lParam