X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1f2ac459a122eec2fa2317765b5c30909fca750..979d7319df1b702a12be015dafc2793a32e14b37:/include/wx/gtk/window.h

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index dbc427553f..de52035835 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -11,7 +11,7 @@
 #ifndef __GTKWINDOWH__
 #define __GTKWINDOWH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface
 #endif
 
@@ -69,7 +69,7 @@ public:
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Update();
-    virtual void Clear();
+    virtual void ClearBackground();
 
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual bool SetForegroundColour( const wxColour &colour );
@@ -157,6 +157,17 @@ public:
     // 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();
 
@@ -180,6 +191,9 @@ public:
     // is this window transparent for the mouse events (as wxStaticBox is)?
     virtual bool IsTransparentForMouse() const { return FALSE; }
 
+    // is this a radiobutton (used by radiobutton code itself only)?
+    virtual bool IsRadioButton() const { return FALSE; }
+
     // position and size of the window
     int                  m_x, m_y;
     int                  m_width, m_height;
@@ -187,19 +201,26 @@ public:
 
     // see the docs in src/gtk/window.cpp
     GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK
-    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWindows
+    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWidgets
 
     // 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
+    // XIM support for wxWidgets
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif
+#endif
 
+#ifndef __WXGTK20__
     // The area to be cleared (and not just refreshed)
+    // We cannot make this distinction under GTK 2.0.
     wxRegion             m_clearRegion;
+#endif
 
     // scrolling stuff
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
@@ -214,9 +235,6 @@ public:
     bool                 m_hasVMT:1;
     bool                 m_sizeSet:1;
     bool                 m_resizing:1;
-    bool                 m_isRadioButton:1;     // faster than IS_KIND_OF
-    bool                 m_isListBox:1;         // faster than IS_KIND_OF
-    bool                 m_isFrame:1;           // faster than IS_KIND_OF
     bool                 m_acceptsFocus:1;      // true if not static
     bool                 m_hasFocus:1;          // true if == FindFocus()
     bool                 m_isScrolling:1;       // dragging scrollbar thumb?