Better support for unspecified property value in wxDateProperty and DatePickerCtrl...

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 77bbb3a066d04e0b8daac70e9acf1d78a41a5f32..0d3a611b273359161179e72399f1f857cfc11173 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -12,7 +12,7 @@
 
 #include "wx/bitmap.h"
 
 
 #include "wx/bitmap.h"
 

-class WXDLLIMPEXP_CORE wxGTKRadioButtonInfo;
+class WXDLLIMPEXP_FWD_CORE wxGTKRadioButtonInfo;

 
 #include "wx/list.h"
 
 
 #include "wx/list.h"
 


@@ -128,20 +128,17 @@ public:
     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    void SetFocus();

     void GtkDisableEvents();
     void GtkEnableEvents();
 #if wxUSE_TOOLTIPS
     void GtkDisableEvents();
     void GtkEnableEvents();
 #if wxUSE_TOOLTIPS

-    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+    void ApplyToolTip( GtkTooltips *tips, const gchar *tip );

 #endif // wxUSE_TOOLTIPS
 
 #endif // wxUSE_TOOLTIPS
 

-    virtual void OnInternalIdle();
-
-    bool                        m_hasFocus,
-                                m_lostFocus;

     wxRadioBoxButtonsInfoList   m_buttonsInfo;
 
 protected:
     wxRadioBoxButtonsInfoList   m_buttonsInfo;
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

 #if wxUSE_TOOLTIPS
     virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip);
 #endif
 #if wxUSE_TOOLTIPS
     virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip);
 #endif


@@ -149,12 +146,11 @@ protected:
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     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)
 };