fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h
index 8611d506b891edf4e9e10872fe39730aaa013831..98f638b415822610cb3fc438423ea6cea3329ed1 100644 (file)
--- a/include/wx/gtk/radiobut.h
+++ b/include/wx/gtk/radiobut.h
@@ -7,13 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKRADIOBUTTONH__
-#define __GTKRADIOBUTTONH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
+#ifndef _WX_GTK_RADIOBUT_H_
+#define _WX_GTK_RADIOBUT_H_

 
 //-----------------------------------------------------------------------------
 // wxRadioButton
 
 //-----------------------------------------------------------------------------
 // wxRadioButton


@@ -56,18 +51,17 @@ public:
 
     virtual bool IsRadioButton() const { return TRUE; }
 
 
     virtual bool IsRadioButton() const { return TRUE; }
 

-    GSList *m_radioButtonGroup;
-    void DoApplyWidgetStyle(GtkRcStyle *style);
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void OnInternalIdle();
-

     bool m_blockEvent;
 
 protected:
     bool m_blockEvent;
 
 protected:

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

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 };
 

-#endif // __GTKRADIOBUTTONH__
+#endif // _WX_GTK_RADIOBUT_H_