use MSWCreateControl() instead of the old mess; implemented Get(Class)DefaultAttributes()

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

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index 0e6d7b022a3b0e69e3b47ab2273560c7245f42af..9534ba0ba0fcd67b58e7d5dc7ad3a22e08e09f83 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,15 +83,25 @@ 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);
+    virtual bool     Enable(bool bEnable = TRUE);

     void             Enable( int  nItem
                             ,bool bEnable
                            );
     void             Enable( int  nItem
                             ,bool bEnable
                            );


@@ -89,7 +118,7 @@ public:
                                 ,WXWORD wId
                                );
     void             SendNotificationEvent(void);
                                 ,WXWORD wId
                                );
     void             SendNotificationEvent(void);

-    void             Show( int  nItem
+    virtual void     Show( int  nItem

                           ,bool bShow =  TRUE
                          ) ;
     bool             Show(bool bShow);
                           ,bool bShow =  TRUE
                          ) ;
     bool             Show(bool bShow);


@@ -115,12 +144,12 @@ public:
                    void     GetSize( int* pnX
                                     ,int* pnY
                                    ) const;
                    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
                    void     AdjustButtons( int nX
                                           ,int nY
                                           ,int nWidth
                                           ,int nHeight

-                                          ,int lSizeFlags
+                                          ,int nSizeFlags

                                          );
                    wxString GetString(int nIndex) const;
            virtual wxString GetStringSelection(void) const;
                                          );
                    wxString GetString(int nIndex) const;
            virtual wxString GetStringSelection(void) const;


@@ -146,12 +175,6 @@ public:
 
 
 protected:
 
 
 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
     virtual wxSize DoGetBestSize(void) const;
     virtual void   DoSetSize( int nX
                              ,int nY