X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18128cbb47b5775f20fb449dd34f36fa31776d51..da0766ab2ae2357cd4dc111415731ee85aa45984:/include/wx/motif/radiobox.h diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h index 0715c8fde9..56705a5780 100644 --- a/include/wx/motif/radiobox.h +++ b/include/wx/motif/radiobox.h @@ -12,14 +12,12 @@ #ifndef _WX_RADIOBOX_H_ #define _WX_RADIOBOX_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "radiobox.h" #endif #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr; - // List box item class WXDLLEXPORT wxBitmap ; @@ -73,22 +71,18 @@ public: virtual void ChangeFont(bool keepOriginalSize = TRUE); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); - WXWidget GetTopWidget() const { return m_formWidget; } - WXWidget GetLabelWidget() const { return m_labelWidget; } - WXWidget GetFrameWidget() const { return m_frameWidget; } - inline WXWidget* GetRadioButtons() const { return m_radioButtons; } - inline void SetSel(int i) { m_selectedButton = i; } + WXWidget* GetRadioButtons() const { return m_radioButtons; } + void SetSel(int i) { m_selectedButton = i; } + virtual WXWidget GetLabelWidget() const { return m_labelWidget; } protected: - int m_majorDim ; + int m_majorDim; int m_noItems; int m_noRowsOrCols; int m_selectedButton; - WXWidget m_formWidget; - WXWidget m_labelWidget; - WXWidget m_frameWidget; WXWidget* m_radioButtons; + WXWidget m_labelWidget; wxString* m_radioButtonLabels; virtual void DoSetSize(int x, int y,