X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da2101204027855793c4264388b95a208967ae15..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/gtk/window.h diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 2395fb0d1f..ebc2120620 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -15,6 +15,10 @@ #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) //----------------------------------------------------------------------------- @@ -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 // -------------- @@ -193,7 +202,7 @@ public: GtkWidget *m_focusWidget; #ifdef __WXGTK20__ - GtkIMContext *m_imContext; + wxGtkIMData *m_imData; #else #if HAVE_XIM // XIM support for wxWidgets @@ -225,7 +234,10 @@ public: 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 +#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, @@ -255,6 +267,13 @@ 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,