added missing #include <wx/defs.h> (parts of patch 649438)

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index bf7c100c4616f875e8c4fef5aa252ce86096c76e..56705a5780dffcfb3aa296d128e5a1f815a90d7b 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -12,14 +12,12 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "radiobox.h"
 #endif
 
 #include "wx/control.h"
 
 #pragma interface "radiobox.h"
 #endif
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
-

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


@@ -73,8 +71,9 @@ public:
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

-    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;
 
 protected:
     int               m_majorDim;


@@ -83,6 +82,7 @@ protected:
     int               m_selectedButton;
 
     WXWidget*         m_radioButtons;
     int               m_selectedButton;
 
     WXWidget*         m_radioButtons;

+    WXWidget          m_labelWidget;

     wxString*         m_radioButtonLabels;
 
     virtual void DoSetSize(int x, int y,
     wxString*         m_radioButtonLabels;
 
     virtual void DoSetSize(int x, int y,