removed unused enum

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index cfd3a0242a6eed105e6f7f8f7e024dcd45d33ecf..d1c29dd7bde5a195fb65ec7fc8ede4657b21b50e 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

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


@@ -15,82 +15,104 @@
 #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 );

     }
     }

-    ~wxRadioBox(void);
-    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;

-    void SetLabel( const wxString& label );
-    void SetLabel( int item, const wxString& label );
-    void SetLabel( int item, wxBitmap *bitmap );
-    wxString GetLabel( int item ) const;
-    bool Show( bool show );
-    void Enable( bool enable );
-    void Enable( int item, bool enable );
+    void SetString( int n, const wxString& label );
+

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

-    virtual wxString GetStringSelection(void) const;
+    void Enable( int item, bool enable );
+
+    virtual wxString GetStringSelection() const;

     virtual bool SetStringSelection( const wxString& s );
     virtual bool SetStringSelection( const wxString& s );

-    virtual int Number(void) const;
-    int GetNumberOfRowsOrCols(void) const;
+
+    int GetCount() const;
+    int GetNumberOfRowsOrCols() const;

     void SetNumberOfRowsOrCols( int n );
     void SetNumberOfRowsOrCols( int n );

-    
-    void OnSize( wxSizeEvent &event );
+
+    // for compatibility only, don't use these methods in new code!
+#if WXWIN_COMPATIBILITY_2_2
+    int Number() const { return GetCount(); }
+    wxString GetLabel(int n) const { return GetString(n); }
+    void SetLabel( int item, const wxString& label )
+        { SetString(item, label); }
+#endif // WXWIN_COMPATIBILITY_2_2
+
+    // we have to override those to avoid virtual function name hiding
+    wxString GetLabel() const { return wxControl::GetLabel(); }
+    void SetLabel( const wxString& label );
+    bool Show( bool show );
+    bool Enable( bool enable );
+
+    // implementation
+    // --------------
+

     void SetFocus();
     void SetFocus();

-    
-  // implementation    
-    
+    void GtkDisableEvents();
+    void GtkEnableEvents();

     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();

-    
-    bool             m_alreadySent;
+#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;
     wxList           m_boxes;

-    
-  DECLARE_EVENT_TABLE()    
+
+protected:
+    // common part of all ctors
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)

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