Ignore the DECLARE_*()'s when swigging

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

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index d19eed94ea93e96afbd471a19c386dd265ace82b..7be4c61cf3c86712f120846056e685e87a29d5ec 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -14,15 +14,8 @@
 
 #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
-#ifndef GTK_CHECK_VERSION
-    #define GTK_CHECK_VERSION(a, b, c) 0
-#endif
-
 // pango_version_check symbol is quite recent ATM (4/2007)... so we
 // use our own wrapper which implements a smart trick.
 // Use this function as you'd use pango_version_check:
@@ -34,12 +27,12 @@
 extern const gchar *wx_pango_version_check(int major, int minor, int micro);
 
 #if wxUSE_UNICODE
-    #define wxGTK_CONV(s) wxConvUTF8.cWX2MB((s))
+    #define wxGTK_CONV(s) s.utf8_str()
     #define wxGTK_CONV_ENC(s, enc) 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) wxConvUTF8.cMB2WX((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)
@@ -47,11 +40,11 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro);
     #include "wx/font.h"
 
     // convert the text between the given encoding and UTF-8 used by wxGTK
-    extern wxCharBuffer
+    extern WXDLLIMPEXP_CORE wxCharBuffer
     wxConvertToGTK(const wxString& s,
                    wxFontEncoding enc = wxFONTENCODING_SYSTEM);
 
-    extern wxCharBuffer
+    extern WXDLLIMPEXP_CORE wxCharBuffer
     wxConvertFromGTK(const wxString& s,
                      wxFontEncoding enc = wxFONTENCODING_SYSTEM);
 
@@ -95,12 +88,7 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro);
 
 // Some deprecated GTK+ prototypes we still use often
 // FIXME: Don't use them if possible.
-G_BEGIN_DECLS
-
-// Should use gtk_image_new, but the mask seems to be handled different,
-// and we need to migrate
-GtkWidget* gtk_pixmap_new (GdkPixmap *pixmap,
-                           GdkBitmap *mask);
+extern "C" {
 
 // Deprecated since GTK+-1.3.7:
 // Trivial wrapper around gtk_window_move, with some side effects we seem to rely on
@@ -114,34 +102,29 @@ void gtk_window_set_policy (GtkWindow *window,
                             gint       allow_grow,
                             gint       auto_shrink);
 
-G_END_DECLS
-
-//-----------------------------------------------------------------------------
-// Misc. functions
-//-----------------------------------------------------------------------------
+} // extern "C"
 
-// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
-void wxAddGrab(wxWindow* window);
-void wxRemoveGrab(wxWindow* window);
 
-// Escapes string so that it is valid Pango markup XML string:
-WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str);
+// ----------------------------------------------------------------------------
+// various private helper functions
+// ----------------------------------------------------------------------------
 
-// The declaration for gtk_icon_size_lookup was accidentally ifdefed out in
-// GTK+ 2.1.0 which Sun seem to have shipped with some versions of JDS
-// for Solaris 9 x86.
-#ifdef NEED_GTK_ICON_SIZE_LOOKUP
-extern "C" gboolean gtk_icon_size_lookup  (GtkIconSize  size,
-                                           gint         *width,
-                                           gint         *height);
-#endif
-
-#ifdef __WXGTK20__
-#include <gdk/gdktypes.h>
+namespace wxGTKPrivate
+{
 
-// Returns stock accelerator modifier and key code for the given ID
-WXDLLEXPORT bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);
-#endif
+// 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 *GetEntryWidget();
+GtkWidget *GetHeaderButtonWidget();
+GtkWidget *GetSplitterWidget();
+GtkWidget *GetTreeWidget();
+
+} // wxGTKPrivate
 
 #endif // _WX_GTK_PRIVATE_H_