Change GetC to return an int so that it can return wxEOF on error.

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

diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h
index 9f4cd54c02a2a3a106cbdb9751001887b3fdb81b..753c7508f20b5ece3d4bb9d2d719cf1d90a02cbc 100644 (file)
--- a/include/wx/gtk1/private.h
+++ b/include/wx/gtk1/private.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/private.h
+// Name:        wx/gtk1/private.h

 // Purpose:     wxGTK private macros, functions &c
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxGTK private macros, functions &c
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -23,43 +23,15 @@
     #define GTK_CHECK_VERSION(a, b, c) 0
 #endif
 
     #define GTK_CHECK_VERSION(a, b, c) 0
 #endif
 

-#ifdef __WXGTK20__
-#if wxUSE_UNICODE
-    #define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s)
-    #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s)
-#else
-    #define wxGTK_CONV(s) wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC(s) )
-    #define wxGTK_CONV_BACK(s)  wxConvLocal.cWC2WX( (wxConvUTF8.cMB2WC( s ) ) )
-#endif
-#else
-    #define wxGTK_CONV(s) s.c_str()
-    #define wxGTK_CONV_BACK(s) s
-#endif
+#define wxGTK_CONV(s) s.c_str()
+#define wxGTK_CONV_BACK(s) s

 
 
 
 

-// GTK+ 2.0 compatibility define is broken when used from C++ as it
-// casts enum to int implicitly
-#ifdef __WXGTK20__
-    #undef gtk_signal_disconnect_by_func
-    #define gtk_signal_disconnect_by_func(object,func,data) \
-        gtk_signal_compat_matched((object), (func), (data), \
-                                  (GSignalMatchType)(G_SIGNAL_MATCH_FUNC | \
-                                                     G_SIGNAL_MATCH_DATA), 0)
-#endif
-

 // child is not a member of GTK_BUTTON() any more in GTK+ 2.0
 // child is not a member of GTK_BUTTON() any more in GTK+ 2.0

-#ifdef __WXGTK20__
-    #define BUTTON_CHILD(w) GTK_BIN((w))->child
-#else
-    #define BUTTON_CHILD(w) GTK_BUTTON((w))->child
-#endif
+#define BUTTON_CHILD(w) GTK_BUTTON((w))->child

 
 // event_window has disappeared from GtkToggleButton in GTK+ 2.0
 
 // event_window has disappeared from GtkToggleButton in GTK+ 2.0

-#ifdef __WXGTK20__
-    #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_BUTTON((w))->event_window
-#else
-    #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window
-#endif
+#define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window

 
 // gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under
 // previous GTK+ versions but no more
 
 // gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under
 // previous GTK+ versions but no more


@@ -69,31 +41,16 @@
     #define DUMMY_CLIPBOARD_ARG  ,0
 #endif
 
     #define DUMMY_CLIPBOARD_ARG  ,0
 #endif
 

-// _GtkEditable is now private
-#ifdef __WXGTK20__
-    #define GET_EDITABLE_POS(w) gtk_editable_get_position(GTK_EDITABLE(w))
-    #define SET_EDITABLE_POS(w, pos) \
-        gtk_editable_set_position(GTK_EDITABLE(w), (pos))
-#else
-    #define GET_EDITABLE_POS(w) GTK_EDITABLE((w))->current_pos
-    #define SET_EDITABLE_POS(w, pos) \
-        GTK_EDITABLE((w))->current_pos = (pos)
-#endif
+// _GtkEditable is private in GTK2
+#define GET_EDITABLE_POS(w) GTK_EDITABLE((w))->current_pos
+#define SET_EDITABLE_POS(w, pos) \
+    GTK_EDITABLE((w))->current_pos = (pos)

 
 

-// this GtkNotebook struct field has been renamed
-#ifdef __WXGTK20__
-    #define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->event_window
-#else
-    #define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->panel
-#endif
+// this GtkNotebook struct field has been renamed in GTK2
+#define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->panel

 
 

-#ifdef __WXGTK20__
-    #define SCROLLBAR_CBACK_ARG
-    #define GET_SCROLL_TYPE(w)   GTK_SCROLL_JUMP
-#else
-    #define SCROLLBAR_CBACK_ARG
-    #define GET_SCROLL_TYPE(w)   GTK_RANGE((w))->scroll_type
-#endif
+#define SCROLLBAR_CBACK_ARG
+#define GET_SCROLL_TYPE(w)   GTK_RANGE((w))->scroll_type

 
 // translate a GTK+ scroll type to a wxEventType
 inline wxEventType GtkScrollTypeToWx(guint scrollType)
 
 // translate a GTK+ scroll type to a wxEventType
 inline wxEventType GtkScrollTypeToWx(guint scrollType)


@@ -131,9 +88,17 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
             wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
 }
 
             wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
 }
 

-#ifdef __WXGTK20__
-// Escapes string so that it is valid Pango markup XML string:
-wxString wxEscapeStringForPangoMarkup(const wxString& str);
+// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
+void wxAddGrab(wxWindow* window);
+void wxRemoveGrab(wxWindow* window);
+
+// 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
 
 #endif // _WX_GTK_PRIVATE_H_
 #endif
 
 #endif // _WX_GTK_PRIVATE_H_