implemented page close event for wxAuiNotebook

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

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index c689eaa55d4ac77ed9222275baad42a2dac47278..7352f87369905e4896f4c2151e9d110d624591a7 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -15,6 +15,7 @@
 #include <gtk/gtk.h>
 
 #include "wx/event.h"
+#include "wx/gtk/private/string.h"
 
 // fail all version tests if the GTK+ version is so ancient that it doesn't
 // even have GTK_CHECK_VERSION
@@ -80,26 +81,6 @@ G_END_DECLS
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
-//-----------------------------------------------------------------------------
-// Convenience class for g_freeing a gchar* on scope exit automatically
-//-----------------------------------------------------------------------------
-
-class wxGtkString
-{
-public:
-    explicit wxGtkString(gchar *s) : m_str(s) { }
-    ~wxGtkString() { g_free(m_str); }
-
-    const gchar *c_str() const { return m_str; }
-
-    operator gchar *() const { return m_str; }
-
-private:
-    gchar *m_str;
-
-    DECLARE_NO_COPY_CLASS(wxGtkString)
-};
-
 //-----------------------------------------------------------------------------
 // Misc. functions
 //-----------------------------------------------------------------------------
@@ -120,5 +101,12 @@ extern "C" gboolean gtk_icon_size_lookup  (GtkIconSize  size,
                                            gint         *height);
 #endif
 
+#ifdef __WXGTK20__
+#include <gdk/gdktypes.h>
+
+// Returns stock accelerator modifier and key code for the given ID
+WXDLLEXPORT bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);
+#endif
+
 #endif // _WX_GTK_PRIVATE_H_