X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e74c05294a531442eb2d8ce37dd5fcf243814523..72e4e6a397fd04e6d8e0cc5ae22aaba740c3c8bc:/include/wx/gtk1/window.h diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 3d888c0b39..9118c6b3b9 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -23,14 +23,14 @@ struct wxGtkIMData; // callback definition for inserting a window (internal) //----------------------------------------------------------------------------- -class wxWindowGTK; +class WXDLLIMPEXP_CORE wxWindowGTK; typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* ); //----------------------------------------------------------------------------- // wxWindowGTK //----------------------------------------------------------------------------- -class wxWindowGTK : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowGTK : public wxWindowBase { public: // creating the window @@ -80,6 +80,8 @@ public: virtual bool SetCursor( const wxCursor &cursor ); virtual bool SetFont( const wxFont &font ); + virtual bool SetBackgroundStyle(wxBackgroundStyle style) ; + virtual int GetCharHeight() const; virtual int GetCharWidth() const; virtual void GetTextExtent(const wxString& string, @@ -106,6 +108,11 @@ public: virtual void SetDropTarget( wxDropTarget *dropTarget ); #endif // wxUSE_DRAG_AND_DROP +#ifdef __WXGTK20__ + virtual void AddChild( wxWindowBase *child ); + virtual void RemoveChild( wxWindowBase *child ); +#endif + // implementation // -------------- @@ -118,7 +125,7 @@ public: // Internal represention of Update() void GtkUpdate(); - + // For compatibility across platforms (not in event table) void OnIdle(wxIdleEvent& WXUNUSED(event)) {} @@ -135,7 +142,7 @@ public: // to class not by using virtual functions but by using // the m_insertCallback. void DoAddChild(wxWindowGTK *child); - + // This methods sends wxPaintEvents to the window. It reads the // update region, breaks it up into rects and sends an event // for each rect. It is also responsible for background erase @@ -156,12 +163,15 @@ public: #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 + // MR: Now returns the default pango_context for the widget as GtkGetPangoDefaultContext to + // not depend on libpangox - which is completely deprecated. + //BCI: Remove GtkGetPangoX11Context and m_x11Context completely when symbols may be removed PangoContext *GtkGetPangoX11Context(); - PangoContext *m_x11Context; + PangoContext *m_x11Context; // MR: Now unused #endif #if wxUSE_TOOLTIPS @@ -198,13 +208,13 @@ public: #ifdef __WXGTK20__ wxGtkIMData *m_imData; -#else -#if HAVE_XIM +#else // GTK 1 +#ifdef HAVE_XIM // XIM support for wxWidgets GdkIC *m_ic; GdkICAttr *m_icattr; -#endif -#endif +#endif // HAVE_XIM +#endif // GTK 2/1 #ifndef __WXGTK20__ // The area to be cleared (and not just refreshed) @@ -229,6 +239,12 @@ public: bool m_hasFocus:1; // true if == FindFocus() bool m_isScrolling:1; // dragging scrollbar thumb? bool m_clipPaintRegion:1; // TRUE after ScrollWindow() +#ifdef __WXGTK20__ + bool m_dirtyTabOrder:1; // tab order changed, GTK focus + // chain needs update +#endif + bool m_needsStyleChange:1; // May not be able to change + // background style until OnIdle // C++ has no virtual methods in the constrcutor of any class but we need // different methods of inserting a child window into a wxFrame, @@ -249,7 +265,7 @@ public: virtual void DoCaptureMouse(); virtual void DoReleaseMouse(); - + #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip ); #endif // wxUSE_TOOLTIPS @@ -257,7 +273,14 @@ 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, @@ -267,7 +290,7 @@ protected: // 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); @@ -277,6 +300,6 @@ private: DECLARE_NO_COPY_CLASS(wxWindowGTK) }; -extern wxWindow *wxFindFocusedChild(wxWindowGTK *win); +extern WXDLLIMPEXP_CORE wxWindow *wxFindFocusedChild(wxWindowGTK *win); #endif // __GTKWINDOWH__