Fixed OS/2 compilation problems.

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

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index 1da4e3d97997fec74b0645273aa9bf10bf64ac56..6ecfc59a1755248426bd9c6b0909ec634423daea 100644 (file)
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -2,10 +2,9 @@
 // Name:        radiobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        radiobox.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -16,83 +15,101 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"

 #include "wx/bitmap.h"
 
 #include "wx/bitmap.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxRadioBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxRadioBoxNameStr;
-

 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 class wxRadioBox: public wxControl
 {
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 class wxRadioBox: public wxControl
 {

-
-  DECLARE_DYNAMIC_CLASS(wxRadioBox)
-  
-  public:
-  
-    wxRadioBox(void);
-    inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = (const wxString *) NULL,
-             int majorDim = 0, long style = wxRA_HORIZONTAL,
-             const wxValidator& val = wxDefaultValidator, 
-            const wxString& name = wxRadioBoxNameStr )
+public:
+    wxRadioBox() { Init(); }
+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0,
+               const wxString choices[] = (const wxString *) NULL,
+               int majorDim = 1,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator, 
+               const wxString& name = wxRadioBoxNameStr)

     {
     {

-      Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
+        Init();
+
+        Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );

     }
     }

-    bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = (const wxString *) NULL,
-             int majorDim = 0, long style = wxRA_HORIZONTAL,
-             const wxValidator& val = wxDefaultValidator, 
-            const wxString& name = wxRadioBoxNameStr );
+
+    ~wxRadioBox();
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0,
+                const wxString choices[] = (const wxString *) NULL,
+                int majorDim = 0,
+                long style = wxRA_HORIZONTAL,
+                const wxValidator& val = wxDefaultValidator, 
+                const wxString& name = wxRadioBoxNameStr);
+

     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int FindString( const wxString& s) const;
     void SetSelection( int n );

-    int GetSelection(void) const;
+    int GetSelection() const;
+    

     wxString GetString( int n ) const;
     wxString GetString( int n ) const;

-    wxString GetLabel(void) const;
+    
+    wxString GetLabel( int item ) const;
+    wxString GetLabel() const { return wxControl::GetLabel(); }

     void SetLabel( const wxString& label );
     void SetLabel( int item, const wxString& label );
     void SetLabel( const wxString& label );
     void SetLabel( int item, const wxString& label );

+    
+    /* doesn't work */

     void SetLabel( int item, wxBitmap *bitmap );
     void SetLabel( int item, wxBitmap *bitmap );

-    wxString GetLabel( int item ) const;
+    

     bool Show( bool show );
     bool Show( bool show );

-    void Enable( bool enable );
-    void Enable( int item, bool enable );

     void Show( int item, bool show );
     void Show( int item, bool show );

-    virtual wxString GetStringSelection(void) const;
-    virtual bool SetStringSelection( const wxString& s );
-    virtual int Number(void) const;
-    int GetNumberOfRowsOrCols(void) const;
-    void SetNumberOfRowsOrCols( int n );
-    void SetFont( const wxFont &font );
-
-    void OnSize( wxSizeEvent &event );

     
     

-  // implementation    
+    bool Enable( bool enable );
+    void Enable( int item, bool enable );

     
     

-    bool            m_alreadySent;
+    virtual wxString GetStringSelection() const;
+    virtual bool SetStringSelection( const wxString& s );

     
     

-  private:
-  
-    GtkRadioButton *m_radio;
+    int Number() const;
+    int GetCount() const { return Number(); }
+    int GetNumberOfRowsOrCols() const;
+    void SetNumberOfRowsOrCols( int n );

     
     

-  DECLARE_EVENT_TABLE()    
+    // implementation
+    // --------------

     
     

+    void SetFocus();
+    void GtkDisableEvents();
+    void GtkEnableEvents();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+#if wxUSE_TOOLTIPS
+    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+#endif // wxUSE_TOOLTIPS
+    wxSize LayoutItems();
+
+    virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
+    virtual void OnInternalIdle();
+    
+    bool             m_hasFocus,
+                     m_lostFocus;
+    int              m_majorDim;
+    wxList           m_boxes;
+
+protected:
+    // common part of all ctors
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)

 };
 
 #endif // __GTKRADIOBOXH__
 };
 
 #endif // __GTKRADIOBOXH__