X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b047e876e0f3189f86145b8f4754d0bf10ba38c3..5bdcb1f3248ebcac6c73e314e752c13dee8776c7:/include/wx/gtk/private.h?ds=sidebyside diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index fdeaf7f036..69de2460a9 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -15,6 +15,7 @@ #include #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. @@ -27,7 +28,7 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro); #if wxUSE_UNICODE - #define wxGTK_CONV(s) s.utf8_str() + #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)) @@ -51,13 +52,13 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro); // helper: use the encoding of the given font if it's valid inline wxCharBuffer wxConvertToGTK(const wxString& s, const wxFont& font) { - return wxConvertToGTK(s, font.Ok() ? font.GetEncoding() + return wxConvertToGTK(s, font.IsOk() ? font.GetEncoding() : wxFONTENCODING_SYSTEM); } inline wxCharBuffer wxConvertFromGTK(const wxString& s, const wxFont& font) { - return wxConvertFromGTK(s, font.Ok() ? font.GetEncoding() + return wxConvertFromGTK(s, font.IsOk() ? font.GetEncoding() : wxFONTENCODING_SYSTEM); } @@ -86,24 +87,16 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro); #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" - +// Define a macro for converting wxString to char* in appropriate encoding for +// the file names. +#ifdef G_OS_WIN32 + // Under MSW, UTF-8 file name encodings are always used. + #define wxGTK_CONV_FN(s) (s).utf8_str() +#else + // Under Unix use GLib file name encoding (which is also UTF-8 by default + // but may be different from it). + #define wxGTK_CONV_FN(s) (s).fn_str() +#endif // ---------------------------------------------------------------------------- // various private helper functions @@ -117,19 +110,19 @@ namespace wxGTKPrivate // // 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(); +WXDLLIMPEXP_CORE GtkWidget *GetButtonWidget(); +WXDLLIMPEXP_CORE GtkWidget *GetCheckButtonWidget(); +WXDLLIMPEXP_CORE GtkWidget *GetComboBoxWidget(); +WXDLLIMPEXP_CORE GtkWidget *GetEntryWidget(); +WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidgetFirst(); +WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidgetLast(); +WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidget(); +WXDLLIMPEXP_CORE GtkWidget *GetNotebookWidget(); +WXDLLIMPEXP_CORE GtkWidget *GetRadioButtonWidget(); +WXDLLIMPEXP_CORE GtkWidget *GetSplitterWidget(wxOrientation orient = wxHORIZONTAL); +WXDLLIMPEXP_CORE GtkWidget *GetTextEntryWidget(); +WXDLLIMPEXP_CORE GtkWidget *GetTreeWidget(); } // wxGTKPrivate #endif // _WX_GTK_PRIVATE_H_ -