Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index fbb8c6085914b469add061cabf6c2545c245aa95..fda1b8ba18a461bda0b1367f0e5da7e26cec6b0e 100644 (file)
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -15,7 +15,7 @@
 // List box item
 class WXDLLIMPEXP_FWD_CORE wxBitmap ;
 
 // List box item
 class WXDLLIMPEXP_FWD_CORE wxBitmap ;
 

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

 {
 public:
     wxRadioBox();
 {
 public:
     wxRadioBox();


@@ -28,7 +28,7 @@ public:
                       ,int                nNum = 0
                       ,const wxString     asChoices[] = NULL
                       ,int                nMajorDim = 0
                       ,int                nNum = 0
                       ,const wxString     asChoices[] = NULL
                       ,int                nMajorDim = 0

-                      ,long               lStyle = wxRA_HORIZONTAL
+                      ,long               lStyle = wxRA_SPECIFY_COLS

                       ,const wxValidator& rVal = wxDefaultValidator
                       ,const wxString&    rsName = wxRadioBoxNameStr
                      )
                       ,const wxValidator& rVal = wxDefaultValidator
                       ,const wxString&    rsName = wxRadioBoxNameStr
                      )


@@ -54,7 +54,7 @@ public:
                       ,const wxSize&        rSize
                       ,const wxArrayString& asChoices
                       ,int                  nMajorDim = 0
                       ,const wxSize&        rSize
                       ,const wxArrayString& asChoices
                       ,int                  nMajorDim = 0

-                      ,long                 lStyle = wxRA_HORIZONTAL
+                      ,long                 lStyle = wxRA_SPECIFY_COLS

                       ,const wxValidator&   rVal = wxDefaultValidator
                       ,const wxString&      rsName = wxRadioBoxNameStr
                      )
                       ,const wxValidator&   rVal = wxDefaultValidator
                       ,const wxString&      rsName = wxRadioBoxNameStr
                      )


@@ -82,7 +82,7 @@ public:
                 ,int                nNum = 0
                 ,const wxString     asChoices[] = NULL
                 ,int                nMajorDim = 0
                 ,int                nNum = 0
                 ,const wxString     asChoices[] = NULL
                 ,int                nMajorDim = 0

-                ,long               lStyle = wxRA_HORIZONTAL
+                ,long               lStyle = wxRA_SPECIFY_COLS

                 ,const wxValidator& rVal = wxDefaultValidator
                 ,const wxString&    rsName = wxRadioBoxNameStr
                );
                 ,const wxValidator& rVal = wxDefaultValidator
                 ,const wxString&    rsName = wxRadioBoxNameStr
                );


@@ -94,7 +94,7 @@ public:
                 ,const wxSize&        rSize
                 ,const wxArrayString& asChoices
                 ,int                  nMajorDim = 0
                 ,const wxSize&        rSize
                 ,const wxArrayString& asChoices
                 ,int                  nMajorDim = 0

-                ,long                 lStyle = wxRA_HORIZONTAL
+                ,long                 lStyle = wxRA_SPECIFY_COLS

                 ,const wxValidator&   rVal = wxDefaultValidator
                 ,const wxString&      rsName = wxRadioBoxNameStr
                );
                 ,const wxValidator&   rVal = wxDefaultValidator
                 ,const wxString&      rsName = wxRadioBoxNameStr
                );


@@ -150,7 +150,7 @@ public:
     inline         void     SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
                    void     SetFocus(void);
            virtual bool     SetFont(const wxFont& rFont);
     inline         void     SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
                    void     SetFocus(void);
            virtual bool     SetFont(const wxFont& rFont);

-    inline         void     SetLabelFont(const wxFont& WXUNUSED(font)) {};
+    inline         void     SetLabelFont(const wxFont& WXUNUSED(font)) {}

            virtual void     SetSelection(int nIndex);
            virtual void     SetString(unsigned int nNum, const wxString& rsLabel);
     virtual bool SetStringSelection(const wxString& rsStr);
            virtual void     SetSelection(int nIndex);
            virtual void     SetString(unsigned int nNum, const wxString& rsLabel);
     virtual bool SetStringSelection(const wxString& rsStr);


@@ -165,6 +165,7 @@ public:
     wxString GetLabel(int nItem) const;
 
 protected:
     wxString GetLabel(int nItem) const;
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual wxSize DoGetBestSize(void) const;
     virtual void   DoSetSize( int nX
                              ,int nY
     virtual wxSize DoGetBestSize(void) const;
     virtual void   DoSetSize( int nX
                              ,int nY