X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/740dd154a58a385d55718d254f5fedd416776af5..5bdcb1f3248ebcac6c73e314e752c13dee8776c7:/include/wx/gtk/private.h diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index 96deaf28b3..69de2460a9 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -28,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)) @@ -87,6 +87,17 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro); #define wxGTK_CONV_BACK_SYS(s) wxConvertFromGTK((s)) #endif +// 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 // ---------------------------------------------------------------------------- @@ -108,7 +119,7 @@ WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidgetLast(); WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidget(); WXDLLIMPEXP_CORE GtkWidget *GetNotebookWidget(); WXDLLIMPEXP_CORE GtkWidget *GetRadioButtonWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetSplitterWidget(); +WXDLLIMPEXP_CORE GtkWidget *GetSplitterWidget(wxOrientation orient = wxHORIZONTAL); WXDLLIMPEXP_CORE GtkWidget *GetTextEntryWidget(); WXDLLIMPEXP_CORE GtkWidget *GetTreeWidget();