Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

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

diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h
index d7e76e904a73f59bebdcf04e3ed1fa55ff938e3a..8ccf2dad8725618cdb16d38b2e04e7e4b37ac35e 100644 (file)
--- a/include/wx/motif/radiobut.h
+++ b/include/wx/motif/radiobut.h
@@ -12,18 +12,13 @@
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 

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

 #pragma interface "radiobut.h"
 #endif
 
 #pragma interface "radiobut.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-

 class WXDLLEXPORT wxRadioButton: public wxControl
 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 class WXDLLEXPORT wxRadioButton: public wxControl
 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)

-protected:

 public:
     wxRadioButton();
     ~wxRadioButton() { RemoveFromCycle(); }
 public:
     wxRadioButton();
     ~wxRadioButton() { RemoveFromCycle(); }


@@ -51,12 +46,10 @@ public:
     void Command(wxCommandEvent& event);
     
     // Implementation
     void Command(wxCommandEvent& event);
     
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);

     virtual void ChangeBackgroundColour();
     virtual void ChangeBackgroundColour();

-    virtual void ChangeForegroundColour();

 
     // *this function is an implementation detail*
 
     // *this function is an implementation detail*

-    // clears the selection in the readiobuttons in the cycle
+    // clears the selection in the radiobuttons in the cycle

     // and returns the old selection (if any)
     wxRadioButton* ClearSelections();
 private:
     // and returns the old selection (if any)
     wxRadioButton* ClearSelections();
 private:


@@ -67,41 +60,5 @@ private:
     wxRadioButton *m_cycle;
 };
 
     wxRadioButton *m_cycle;
 };
 

-// Not implemented
-#if 0
-class WXDLLEXPORT wxBitmap ;
-
-WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
-
-class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
-{
-    DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
-protected:
-    wxBitmap *theButtonBitmap;
-public:
-    inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
-    inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
-        const wxBitmap *label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxBitmapRadioButtonNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-    
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxBitmap *label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxBitmapRadioButtonNameStr);
-    
-    virtual void SetLabel(const wxBitmap *label);
-    virtual void SetValue(bool val) ;
-    virtual bool GetValue() const ;
-};
-#endif
-

 #endif
 // _WX_RADIOBUT_H_
 #endif
 // _WX_RADIOBUT_H_