Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index 2bf984ce4513df239fa5782c296f813ab9e404d1..69de2460a99f279ab02704bf23beb5235d6edea6 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -17,8 +17,6 @@
 #include "wx/gtk/private/string.h"
 #include "wx/gtk/private/gtk2-compat.h"
 
 #include "wx/gtk/private/string.h"
 #include "wx/gtk/private/gtk2-compat.h"
 

-class WXDLLIMPEXP_FWD_CORE wxFont;
-

 // 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:
 // 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:


@@ -30,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxFont;
 extern const gchar *wx_pango_version_check(int major, int minor, int micro);
 
 #if wxUSE_UNICODE
 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))
     #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))


@@ -89,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 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // various private helper functions
 // ----------------------------------------------------------------------------


@@ -101,34 +110,19 @@ namespace wxGTKPrivate
 //
 // the returned widgets shouldn't be destroyed, this is done automatically on
 // shutdown
 //
 // 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();
-
-// Set Pango attributes corresponding to the given font for the span 0..len (or
-// without any bounds if len == 0) in the specified layout. Currently only
-// underlined and strike-through attributes are handled by this function.
-//
-// Special "addDummyAttrs" parameter is used to work around a bug in old Pango
-// versions in wxWindowDCImpl::DoDrawText(), see comment there.
-//
-// If neither of them is specified, returns false, otherwise sets up the
-// attributes and returns true.
-//
-// This function is implemented in src/gtk/dcclient.cpp.
-bool
-SetPangoAttrsForFont(const wxFont& font, PangoLayout* layout, size_t len = 0,
-                     bool addDummyAttrs = false);
+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_
 
 } // wxGTKPrivate
 
 #endif // _WX_GTK_PRIVATE_H_

-