No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 1f2fb13bf5cf192601f9e3e47597c55cd82ae6aa..a7f6bd912546ab81b22e0c8675b2811fba1df4f8 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/radiobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        wx/gtk/radiobox.h
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,6 +11,13 @@
 
 #include "wx/bitmap.h"
 
 
 #include "wx/bitmap.h"
 

+class WXDLLIMPEXP_FWD_CORE wxGTKRadioButtonInfo;
+
+#include "wx/list.h"
+
+WX_DECLARE_EXPORTED_LIST(wxGTKRadioButtonInfo, wxRadioBoxButtonsInfoList);
+
+

 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------


@@ -21,7 +27,7 @@ class WXDLLIMPEXP_CORE wxRadioBox : public wxControl,
 {
 public:
     // ctors and dtor
 {
 public:
     // ctors and dtor

-    wxRadioBox() { Init(); }
+    wxRadioBox() { }

     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,


@@ -29,13 +35,11 @@ public:
                const wxSize& size = wxDefaultSize,
                int n = 0,
                const wxString choices[] = (const wxString *) NULL,
                const wxSize& size = wxDefaultSize,
                int n = 0,
                const wxString choices[] = (const wxString *) NULL,

-               int majorDim = 1,
-               long style = wxRA_HORIZONTAL,
+               int majorDim = 0,
+               long style = wxRA_SPECIFY_COLS,

                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {

-        Init();
-

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


@@ -45,13 +49,11 @@ public:
                const wxPoint& pos,
                const wxSize& size,
                const wxArrayString& choices,
                const wxPoint& pos,
                const wxSize& size,
                const wxArrayString& choices,

-               int majorDim = 1,
-               long style = wxRA_HORIZONTAL,
+               int majorDim = 0,
+               long style = wxRA_SPECIFY_COLS,

                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {

-        Init();
-

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


@@ -63,7 +65,7 @@ public:
                 int n = 0,
                 const wxString choices[] = (const wxString *) NULL,
                 int majorDim = 0,
                 int n = 0,
                 const wxString choices[] = (const wxString *) NULL,
                 int majorDim = 0,

-                long style = wxRA_HORIZONTAL,
+                long style = wxRA_SPECIFY_COLS,

                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
     bool Create(wxWindow *parent,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
     bool Create(wxWindow *parent,


@@ -73,7 +75,7 @@ public:
                 const wxSize& size,
                 const wxArrayString& choices,
                 int majorDim = 0,
                 const wxSize& size,
                 const wxArrayString& choices,
                 int majorDim = 0,

-                long style = wxRA_HORIZONTAL,
+                long style = wxRA_SPECIFY_COLS,

                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 


@@ -107,32 +109,43 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

+    virtual int GetItemFromPoint( const wxPoint& pt ) const;
+#if wxUSE_HELP
+    // override virtual wxWindow::GetHelpTextAtPoint to use common platform independent
+    // wxRadioBoxBase::DoGetHelpTextAtPoint from the platform independent
+    // base class-interface wxRadioBoxBase.
+    virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const
+    {
+        return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin );
+    }
+#endif // wxUSE_HELP
+

     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    void SetFocus();

     void GtkDisableEvents();
     void GtkEnableEvents();
     void GtkDisableEvents();
     void GtkEnableEvents();

-    bool IsOwnGtkWindow( GdkWindow *window );

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+    virtual void GTKApplyToolTip(const char* tip);

 #endif // wxUSE_TOOLTIPS
 
 #endif // wxUSE_TOOLTIPS
 

-    virtual void OnInternalIdle();
-
-    bool             m_hasFocus,
-                     m_lostFocus;
-    wxList           m_boxes;
+    wxRadioBoxButtonsInfoList   m_buttonsInfo;

 
 protected:
 
 protected:

-    void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
+#if wxUSE_TOOLTIPS
+    virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip);
+#endif
+
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+
+    virtual bool GTKNeedsToFilterSameWindowFocus() const { return true; }

 
     virtual bool GTKWidgetNeedsMnemonic() const;
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
 
 
     virtual bool GTKWidgetNeedsMnemonic() const;
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
 

-    // common part of all ctors
-    void Init();
-

 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };