X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec373f2a81c1909bc3e88938a63d18bee51dfe13..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk/window.h diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 9a1efc1cc8..171f34fac9 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -14,14 +14,14 @@ #ifdef __WXGTK3__ typedef struct _cairo cairo_t; + typedef struct _GtkStyleProvider GtkStyleProvider; #define WXUNUSED_IN_GTK3(x) #else #define WXUNUSED_IN_GTK3(x) x #endif -// helper structure that holds class that holds GtkIMContext object and -// some additional data needed for key events processing -struct wxGtkIMData; +typedef struct _GdkEventKey GdkEventKey; +typedef struct _GtkIMContext GtkIMContext; WX_DEFINE_EXPORTED_ARRAY_PTR(GdkWindow *, wxArrayGdkWindows); @@ -59,8 +59,6 @@ public: // implement base class (pure) virtual methods // ------------------------------------------- - virtual bool Destroy(); - virtual void Raise(); virtual void Lower(); @@ -185,11 +183,6 @@ public: static wxLayoutDirection GTKGetLayout(GtkWidget *widget); static void GTKSetLayout(GtkWidget *widget, wxLayoutDirection dir); - // return true if this window must have a non-NULL parent, false if it can - // be created without parent (normally only top level windows but in wxGTK - // there is also the exception of wxMenuBar) - virtual bool GTKNeedsParent() const { return !IsTopLevel(); } - // This is called when capture is taken from the window. It will // fire off capture lost events. void GTKReleaseMouseAndNotify(); @@ -256,7 +249,11 @@ public: // position and size of the window int m_x, m_y; int m_width, m_height; - int m_oldClientWidth,m_oldClientHeight; + int m_clientWidth, m_clientHeight; + // Whether the client size variables above are known to be correct + // (because they have been validated by a size-allocate) and should + // be used to report client size + bool m_useCachedClientSize; // see the docs in src/gtk/window.cpp GtkWidget *m_widget; // mostly the widget seen by the rest of GTK @@ -274,7 +271,40 @@ public: void GTKDisableFocusOutEvent(); void GTKEnableFocusOutEvent(); - wxGtkIMData *m_imData; + + // Input method support + + // The IM context used for generic, i.e. non-native, windows. + // + // It might be a good idea to avoid allocating it unless key events from + // this window are really needed but currently we do it unconditionally. + // + // For native widgets (i.e. those for which IsOfStandardClass() returns + // true) it is NULL. + GtkIMContext* m_imContext; + + // Pointer to the event being currently processed by the IME or NULL if not + // inside key handling. + GdkEventKey* m_imKeyEvent; + + // This method generalizes gtk_im_context_filter_keypress(): for the + // generic windows it does just that but it's overridden by the classes + // wrapping native widgets that use IM themselves and so provide specific + // methods for accessing it such gtk_entry_im_context_filter_keypress(). + virtual int GTKIMFilterKeypress(GdkEventKey* event) const; + + // This method must be called from the derived classes "insert-text" signal + // handlers to check if the text is not being inserted by the IM and, if + // this is the case, generate appropriate wxEVT_CHAR events for it. + // + // Returns true if we did generate and process events corresponding to this + // text or false if we didn't handle it. + bool GTKOnInsertText(const char* text); + + // This is just a helper of GTKOnInsertText() which is also used by GTK+ + // "commit" signal handler. + bool GTKDoInsertTextFromIM(const char* text); + // indices for the arrays below enum ScrollDir { ScrollDir_Horz, ScrollDir_Vert, ScrollDir_Max }; @@ -308,14 +338,11 @@ public: // extra (wxGTK-specific) flags bool m_noExpose:1; // wxGLCanvas has its own redrawing bool m_nativeSizeEvent:1; // wxGLCanvas sends wxSizeEvent upon "alloc_size" - bool m_hasVMT:1; // set after PostCreation() is called bool m_isScrolling:1; // dragging scrollbar thumb? bool m_clipPaintRegion:1; // true after ScrollWindow() wxRegion m_nativeUpdateRegion; // not transformed for RTL bool m_dirtyTabOrder:1; // tab order changed, GTK focus // chain needs update - bool m_needsStyleChange:1; // May not be able to change - // background style until OnIdle bool m_mouseButtonDown:1; bool m_showOnIdle:1; // postpone showing the window until idle @@ -352,6 +379,7 @@ protected: void GTKFreezeWidget(GtkWidget *w); void GTKThawWidget(GtkWidget *w); + void GTKDisconnect(void* instance); #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip ); @@ -375,10 +403,8 @@ protected: #ifndef __WXGTK3__ // 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 *GTKCreateWidgetStyle(bool forceStyle = false); + // modified GTK style with non-standard attributes. + GtkRcStyle* GTKCreateWidgetStyle(); #endif void GTKApplyWidgetStyle(bool forceStyle = false); @@ -403,6 +429,11 @@ protected: private: void Init(); + // return true if this window must have a non-NULL parent, false if it can + // be created without parent (normally only top level windows but in wxGTK + // there is also the exception of wxMenuBar) + virtual bool GTKNeedsParent() const { return !IsTopLevel(); } + enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max }; // common part of ScrollLines() and ScrollPages() and could be used, in the @@ -416,6 +447,8 @@ private: #ifdef __WXGTK3__ // paint context is stashed here so wxPaintDC can use it cairo_t* m_paintContext; + // style provider for "background-image" + GtkStyleProvider* m_styleProvider; public: cairo_t* GTKPaintContext() const