X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b4f3c9f768c91d1927c263f5db644cc16fca0b9..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/gtk/window.h diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 5917cf4384..ebc2120620 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -11,10 +11,14 @@ #ifndef __GTKWINDOWH__ #define __GTKWINDOWH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif +// helper structure that holds class that holds GtkIMContext object and +// some additional data needed for key events processing +struct wxGtkIMData; + //----------------------------------------------------------------------------- // callback definition for inserting a window (internal) //----------------------------------------------------------------------------- @@ -69,7 +73,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 ); @@ -101,6 +105,11 @@ public: #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget( wxDropTarget *dropTarget ); #endif // wxUSE_DRAG_AND_DROP + +#ifdef __WXGTK20__ + virtual void AddChild( wxWindowBase *child ); + virtual void RemoveChild( wxWindowBase *child ); +#endif // implementation // -------------- @@ -115,10 +124,6 @@ public: // Internal represention of Update() void GtkUpdate(); - // For delayed background - void GtkSetBackgroundColour( const wxColour &colour ); - void GtkSetForegroundColour( const wxColour &colour ); - // For compatibility across platforms (not in event table) void OnIdle(wxIdleEvent& WXUNUSED(event)) {} @@ -153,15 +158,16 @@ public: virtual bool IsOwnGtkWindow( GdkWindow *window ); void ConnectWidget( GtkWidget *widget ); - // Creates a new widget style if none is there - // and sets m_widgetStyle to this value. - GtkStyle *GetWidgetStyle(); - - // Called by SetFont() and SetXXXColour etc - void SetWidgetStyle(); - - // Overridden in many GTK widgets who have to handle subwidgets - virtual void ApplyWidgetStyle(); +#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 #if wxUSE_TOOLTIPS virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); @@ -190,19 +196,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__ + wxGtkIMData *m_imData; +#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; @@ -217,24 +230,14 @@ public: bool m_hasVMT:1; bool m_sizeSet:1; bool m_resizing:1; - 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? bool m_clipPaintRegion:1; // TRUE after ScrollWindow() - bool m_queuedFullRedraw:1; // TRUE after DoMoveWindow - - // These are true if the style were set before the widget was realized - // (typcally in the constructor) but the actual GTK style must not be set - // before the widget has been "realized" - bool m_delayedForegroundColour:1; - bool m_delayedBackgroundColour:1; - - // Contains GTK's widgets internal information about non-default widget - // font and colours. we create one for each widget that gets any - // non-default attribute set via SetFont() or SetForegroundColour() / - // SetBackgroundColour(). - GtkStyle *m_widgetStyle; +#ifdef __WXGTK20__ + bool m_dirtyTabOrder:1; // tab order changed, GTK focus + // chain needs update +#endif // C++ has no virtual methods in the constrcutor of any class but we need // different methods of inserting a child window into a wxFrame, @@ -263,6 +266,27 @@ public: protected: // common part of all ctors (not virtual because called from ctor) void Init(); + +#ifdef __WXGTK20__ + virtual void DoMoveInTabOrder(wxWindow *win, MoveKind move); + + // Copies m_children tab order to GTK focus chain: + void RealizeTabOrder(); +#endif + + // Called by ApplyWidgetStyle (which is called by SetFont() and + // SetXXXColour etc to apply style changed to native widgets) to create + // modified GTK style with non-standard attributes. If forceStyle=true, + // creates empty GtkRcStyle if there are no modifications, otherwise + // returns NULL in such case. + GtkRcStyle *CreateWidgetStyle(bool forceStyle = false); + + // Overridden in many GTK widgets who have to handle subwidgets + virtual void ApplyWidgetStyle(bool forceStyle = false); + + // helper function to ease native widgets wrapping, called by + // ApplyWidgetStyle -- override this, not ApplyWidgetStyle + virtual void DoApplyWidgetStyle(GtkRcStyle *style); private: DECLARE_DYNAMIC_CLASS(wxWindowGTK)