X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d760f23e7634a953bb6e1ced0de69f7016c12884..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/window.h diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index f9116d3d20..13adf9b21f 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -11,7 +11,7 @@ #ifndef __GTKWINDOWH__ #define __GTKWINDOWH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -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; @@ -192,14 +206,21 @@ public: // 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 +#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,8 +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_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?