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 1e1d07f15a5c39c73fc15dfafdc108733d2d030d..c1a8c66f6ebc18bb4e426c0b59cad6f655cf02c3 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -15,9 +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/dc.h"
-#include "wx/gtk/dcclient.h"
-#include "wx/gtk/dcmemory.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.


@@ -35,7 +33,7 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro);
     #define wxGTK_CONV_FONT(s, font) wxGTK_CONV((s))
     #define wxGTK_CONV_SYS(s) wxGTK_CONV((s))
 
     #define wxGTK_CONV_FONT(s, font) wxGTK_CONV((s))
     #define wxGTK_CONV_SYS(s) wxGTK_CONV((s))
 

-    #define wxGTK_CONV_BACK(s) wxString::FromUTF8(s)
+    #define wxGTK_CONV_BACK(s) wxString::FromUTF8Unchecked(s)

     #define wxGTK_CONV_BACK_ENC(s, enc) wxGTK_CONV_BACK(s)
     #define wxGTK_CONV_BACK_FONT(s, font) wxGTK_CONV_BACK(s)
     #define wxGTK_CONV_BACK_SYS(s) wxGTK_CONV_BACK(s)
     #define wxGTK_CONV_BACK_ENC(s, enc) wxGTK_CONV_BACK(s)
     #define wxGTK_CONV_BACK_FONT(s, font) wxGTK_CONV_BACK(s)
     #define wxGTK_CONV_BACK_SYS(s) wxGTK_CONV_BACK(s)


@@ -89,23 +87,31 @@ 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" {
+// ----------------------------------------------------------------------------
+// various private helper functions
+// ----------------------------------------------------------------------------

 
 

-// 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);
+namespace wxGTKPrivate
+{

 
 

-// 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"
+// these functions create the GTK widgets of the specified types which can then
+// used to retrieve their styles, pass them to drawing functions &c
+//
+// the returned widgets shouldn't be destroyed, this is done automatically on
+// shutdown
+GtkWidget *GetButtonWidget();
+GtkWidget *GetCheckButtonWidget();
+GtkWidget *GetComboBoxWidget();
+GtkWidget *GetEntryWidget();
+GtkWidget *GetHeaderButtonWidgetFirst();
+GtkWidget *GetHeaderButtonWidgetLast();
+GtkWidget *GetHeaderButtonWidget();
+GtkWidget *GetRadioButtonWidget();
+GtkWidget *GetSplitterWidget();
+GtkWidget *GetTextEntryWidget();
+GtkWidget *GetTreeWidget();
+
+} // wxGTKPrivate

 
 #endif // _WX_GTK_PRIVATE_H_
 
 
 #endif // _WX_GTK_PRIVATE_H_