added NO_PTR versions of ARRAY macros to suppress warnings (based on patch 770983)

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 7a48f97ffdd0c2269671512e2ab97fc07c9465e6..13adf9b21fe2f63c4e3e826365b8b47d6921f94d 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -157,6 +157,17 @@ public:
     // and sets m_widgetStyle to this value.
     GtkStyle *GetWidgetStyle();
 
     // and sets m_widgetStyle to this value.
     GtkStyle *GetWidgetStyle();
 

+#ifdef __WXGTK20__
+    // Returns the default context which usually is anti-aliased
+    PangoContext   *GtkGetPangoDefaultContext();
+    
+    // Returns the X11 context which renders on the X11 client
+    // side (which can be remote) and which usually is not
+    // anti-aliased and is thus faster
+    PangoContext   *GtkGetPangoX11Context();
+    PangoContext   *m_x11Context;
+#endif
+

     // Called by SetFont() and SetXXXColour etc
     void SetWidgetStyle();
 
     // Called by SetFont() and SetXXXColour etc
     void SetWidgetStyle();
 


@@ -195,11 +206,15 @@ public:
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
 
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
 

+#ifdef __WXGTK20__
+    GtkIMMulticontext   *m_imContext;
+#else

 #if HAVE_XIM
     // XIM support for wxWindows
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif
 #if HAVE_XIM
     // XIM support for wxWindows
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif

+#endif

 
 #ifndef __WXGTK20__
     // The area to be cleared (and not just refreshed)
 
 #ifndef __WXGTK20__
     // The area to be cleared (and not just refreshed)