Fix crash when appending menuitem after removing it from another menu.

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

diff --git a/include/wx/gtk/hyperlink.h b/include/wx/gtk/hyperlink.h
index 91308f9153fa050075d46a4f7f73569c846a0b66..8156bf10e54ae866a0d66186cc8a14505e39c287 100644 (file)
--- a/include/wx/gtk/hyperlink.h
+++ b/include/wx/gtk/hyperlink.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKHYPERLINKCTRLH__
-#define __GTKHYPERLINKCTRLH__
+#ifndef _WX_GTKHYPERLINKCTRL_H_
+#define _WX_GTKHYPERLINKCTRL_H_

 
 #include "wx/generic/hyperlink.h"
 
 
 #include "wx/generic/hyperlink.h"
 


@@ -62,16 +62,12 @@ public:
     virtual void SetLabel(const wxString &label);
 
 protected:
     virtual void SetLabel(const wxString &label);
 
 protected:

-    // overridden base class virtuals
-
-    // Returns the best size for the window, which is the size needed
-    // to display the text label.

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

+    virtual wxSize DoGetBestClientSize() const;

 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 

-private:

     DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrl)
 };
 
     DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrl)
 };
 

-#endif // __GTKHYPERLINKCTRLH__
+#endif // _WX_GTKHYPERLINKCTRL_H_