Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

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

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index 7be4c61cf3c86712f120846056e685e87a29d5ec..c1a8c66f6ebc18bb4e426c0b59cad6f655cf02c3 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -15,6 +15,7 @@
 #include <gtk/gtk.h>
 
 #include "wx/gtk/private/string.h"
 #include <gtk/gtk.h>
 
 #include "wx/gtk/private/string.h"

+#include "wx/gtk/private/gtk2-compat.h"

 
 // pango_version_check symbol is quite recent ATM (4/2007)... so we
 // use our own wrapper which implements a smart trick.
 
 // pango_version_check symbol is quite recent ATM (4/2007)... so we
 // use our own wrapper which implements a smart trick.


@@ -86,25 +87,6 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro);
     #define wxGTK_CONV_BACK_SYS(s) wxConvertFromGTK((s))
 #endif
 
     #define wxGTK_CONV_BACK_SYS(s) wxConvertFromGTK((s))
 #endif
 

-// Some deprecated GTK+ prototypes we still use often
-// FIXME: Don't use them if possible.
-extern "C" {
-
-// Deprecated since GTK+-1.3.7:
-// Trivial wrapper around gtk_window_move, with some side effects we seem to rely on
-void gtk_widget_set_uposition (GtkWidget *widget,
-                               gint      x,
-                               gint      y);
-
-// We rely on the allow_shrink parameter in one place
-void gtk_window_set_policy (GtkWindow *window,
-                            gint       allow_shrink,
-                            gint       allow_grow,
-                            gint       auto_shrink);
-
-} // extern "C"
-
-

 // ----------------------------------------------------------------------------
 // various private helper functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // various private helper functions
 // ----------------------------------------------------------------------------


@@ -119,9 +101,14 @@ namespace wxGTKPrivate
 // shutdown
 GtkWidget *GetButtonWidget();
 GtkWidget *GetCheckButtonWidget();
 // shutdown
 GtkWidget *GetButtonWidget();
 GtkWidget *GetCheckButtonWidget();

+GtkWidget *GetComboBoxWidget();

 GtkWidget *GetEntryWidget();
 GtkWidget *GetEntryWidget();

+GtkWidget *GetHeaderButtonWidgetFirst();
+GtkWidget *GetHeaderButtonWidgetLast();

 GtkWidget *GetHeaderButtonWidget();
 GtkWidget *GetHeaderButtonWidget();

+GtkWidget *GetRadioButtonWidget();

 GtkWidget *GetSplitterWidget();
 GtkWidget *GetSplitterWidget();

+GtkWidget *GetTextEntryWidget();

 GtkWidget *GetTreeWidget();
 
 } // wxGTKPrivate
 GtkWidget *GetTreeWidget();
 
 } // wxGTKPrivate