fixed DLL compilation warning

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index f648659e65b7855d9ee71822576277514d4473ff..1c9de3b9decd76c024d58129eb02e5feba68ea14 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -1,84 +1,133 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.h
+// Name:        wx/gtk/radiobox.h

 // Purpose:
 // Author:      Robert Roebling
 // 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

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

-

 #ifndef __GTKRADIOBOXH__
 #define __GTKRADIOBOXH__
 
 #ifndef __GTKRADIOBOXH__
 #define __GTKRADIOBOXH__
 

-#ifdef __GNUG__
-#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
+// wxRadioBox

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxRadioBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+class WXDLLIMPEXP_CORE wxRadioBox: public wxControl
+{
+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)
+    {
+        Init();

 
 

-extern const char *wxRadioBoxNameStr;
+        Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
+    }
+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 1,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)
+    {
+        Init();

 
 

-//-----------------------------------------------------------------------------
-// wxRadioBox
-//-----------------------------------------------------------------------------
+        Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
+    }

 
 

-class wxRadioBox: public wxControl
-{
+    virtual ~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);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                int majorDim = 0,
+                long style = wxRA_HORIZONTAL,
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);

 
 

-  DECLARE_DYNAMIC_CLASS(wxRadioBox)
-  
-  public:
-  
-    wxRadioBox(void);
-    wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      int majorDim = 0, long style = wxRA_HORIZONTAL,
-      const wxString &name = wxRadioBoxNameStr );
-    bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      int majorDim = 0, long style = wxRA_HORIZONTAL,
-      const wxString &name = wxRadioBoxNameStr );
-    int FindString( const wxString& s) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;

     void SetSelection( int n );
     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;
-    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 Show( int item, bool show );
-    virtual wxString GetStringSelection(void) const;
+    void SetString( int n, const wxString& label );
+
+    virtual bool Show( int item, bool show = true );
+    virtual bool Enable( int item, bool enable = true );
+
+    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;
-    void SetNumberOfRowsOrCols( int n );
-
-  private:
-  
-    GtkRadioButton *m_radio;
-    
+
+    int GetCount() const;
+
+    // we have to override those to avoid virtual function name hiding
+    virtual wxString GetLabel() const { return wxControl::GetLabel(); }
+    virtual void SetLabel( const wxString& label );
+    virtual bool Show( bool show = true );
+    virtual bool Enable( bool enable = true );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    // implementation
+    // --------------
+
+    void SetFocus();
+    void GtkDisableEvents();
+    void GtkEnableEvents();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+#if wxUSE_TOOLTIPS
+    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+#endif // wxUSE_TOOLTIPS
+
+    virtual void OnInternalIdle();
+
+    bool             m_hasFocus,
+                     m_lostFocus;
+    int              m_majorDim;
+    wxList           m_boxes;
+
+protected:
+    // common part of all ctors
+    void Init();
+
+    // check that the index is valid
+    // FIXME: remove once GTK will derive from wxRadioBoxBase
+    inline bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)

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