great copy ctor/assignment operators cleanup by Paul Cornett (patch 1307665)

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

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index 93ea5878c49002ea1c05cacc3686f35b1342a30c..98750088fe15d47c575817b3979c7d6e39fd96cb 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -5,14 +5,13 @@
 // Modified by:
 // Created:     12.03.02
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     12.03.02
 // RCS-ID:      $Id$

-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows license
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_PRIVATE_H_
 #define _WX_GTK_PRIVATE_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_PRIVATE_H_
 #define _WX_GTK_PRIVATE_H_
 

-#include <gdk/gdk.h>

 #include <gtk/gtk.h>
 
 #include "wx/event.h"
 #include <gtk/gtk.h>
 
 #include "wx/event.h"


@@ -23,77 +22,22 @@
     #define GTK_CHECK_VERSION(a, b, c) 0
 #endif
 
     #define GTK_CHECK_VERSION(a, b, c) 0
 #endif
 

-// 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
-#ifdef __WXGTK20__
-    #define BUTTON_CHILD(w) GTK_BIN((w))->child
-#else
-    #define BUTTON_CHILD(w) GTK_BUTTON((w))->child
-#endif
-
-// 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
-
-// get the font from a style
-//
-// TODO: GdkFont has been replaced by PangoFontDescription in GTK+ 2.0
-//       and we really should use it instead of GdkFont (see also dclient.cpp)
-#ifdef __WXGTK20__
-    #define GET_STYLE_FONT(style) gtk_style_get_font(style)
-    #define SET_STYLE_FONT(style, font) gtk_style_set_font(style, font)
+#if wxUSE_UNICODE
+    #define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s)
+    #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s)

 #else
 #else

-    #define GET_STYLE_FONT(style) ((style)->font)
-    #define SET_STYLE_FONT(style, fnt) \
-        gdk_font_unref( style->font );  \
-        style->font = gdk_font_ref( fnt )
+    #define wxGTK_CONV(s) wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC(s) )
+    #define wxGTK_CONV_BACK(s)  wxConvLocal.cWC2WX( (wxConvUTF8.cMB2WC( s ) ) )

 #endif
 
 #endif
 

-// gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under
-// previous GTK+ versions but no more
-#if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0)
-    #define DUMMY_CLIPBOARD_ARG
-#else
-    #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
-
-// 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
-
-#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
+// FIXME: Make gtk2 only, so no macros needed - MR
+// GTK+ 2.0 compatibility define is broken when used from C++ as it
+// casts enum to int implicitly
+#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)

 
 // 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,5 +75,21 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
             wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
 }
 
             wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
 }
 

+// 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);
+
+// 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 // _WX_GTK_PRIVATE_H_