Upported combobox changes and another fix.

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

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index 0e6d7b022a3b0e69e3b47ab2273560c7245f42af..d6eb7cc229744727917f08e81bdc4f9b6b8e9ba0 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_
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
-
 // List box item
 class WXDLLEXPORT wxBitmap ;
 
@@ -31,9 +29,7 @@ public:
                       ,const wxString     asChoices[] = NULL
                       ,int                nMajorDim = 0
                       ,long               lStyle = wxRA_HORIZONTAL
-#if wxUSE_VALIDATORS
                       ,const wxValidator& rVal = wxDefaultValidator
-#endif
                       ,const wxString&    rsName = wxRadioBoxNameStr
                      )
     {
@@ -46,9 +42,7 @@ public:
                ,asChoices
                ,nMajorDim
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rVal
-#endif
                ,rsName
               );
     }
@@ -64,15 +58,13 @@ public:
                 ,const wxString     asChoices[] = NULL
                 ,int                nMajorDim = 0
                 ,long               lStyle = wxRA_HORIZONTAL
-#if wxUSE_VALIDATORS
                 ,const wxValidator& rVal = wxDefaultValidator
-#endif
                 ,const wxString&    rsName = wxRadioBoxNameStr
                );
 
     void             Command(wxCommandEvent& rEvent);
     bool             ContainsHWND(WXHWND hWnd) const;
-    bool             Enable(bool bEnable);
+    virtual bool     Enable(bool bEnable = TRUE);
     void             Enable( int  nItem
                             ,bool bEnable
                            );
@@ -89,7 +81,7 @@ public:
                                 ,WXWORD wId
                                );
     void             SendNotificationEvent(void);
-    void             Show( int  nItem
+    virtual void     Show( int  nItem
                           ,bool bShow =  TRUE
                          ) ;
     bool             Show(bool bShow);
@@ -115,12 +107,12 @@ public:
                    void     GetSize( int* pnX
                                     ,int* pnY
                                    ) const;
-                   void     GetSizeFlags(void) const;
+    inline         int      GetSizeFlags(void) const { return m_nSizeFlags; }
                    void     AdjustButtons( int nX
                                           ,int nY
                                           ,int nWidth
                                           ,int nHeight
-                                          ,int lSizeFlags
+                                          ,int nSizeFlags
                                          );
                    wxString GetString(int nIndex) const;
            virtual wxString GetStringSelection(void) const;
@@ -146,12 +138,6 @@ public:
 
 
 protected:
-            void   AdjustButtons( int  nX
-                               ,int  nY
-                               ,int  nWidth
-                               ,int  nHeight
-                               ,long lSizeFlags
-                              );
     virtual wxSize DoGetBestSize(void) const;
     virtual void   DoSetSize( int nX
                              ,int nY