X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/015dca24cabea5750e808e7c5f9505165b023c90..21e354f1079619b7cd5ede193ad9ac900e9134d1:/include/wx/gtk/window.h diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 3ec4c2805f..c14e0d836e 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -48,7 +48,7 @@ public: // implement base class (pure) virtual methods // ------------------------------------------- - virtual void SetLabel( const wxString &label ) {} + virtual void SetLabel(const wxString& WXUNUSED(label)) { } virtual wxString GetLabel() const { return wxEmptyString; } virtual bool Destroy(); @@ -91,10 +91,6 @@ public: const wxFont *theFont = (const wxFont *) NULL) const; -#if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); -#endif // wxUSE_MENUS_NATIVE - virtual void SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh = true ); virtual void SetScrollPos( int orient, int pos, bool refresh = true ); @@ -103,15 +99,15 @@ public: virtual int GetScrollRange( int orient ) const; virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL ); + virtual bool ScrollLines(int lines); + virtual bool ScrollPages(int pages); #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 // -------------- @@ -130,7 +126,7 @@ public: void OnIdle(wxIdleEvent& WXUNUSED(event)) {} // wxGTK-specific: called recursively by Enable, - // to give widgets an oppprtunity to correct their colours after they + // to give widgets an opportunity to correct their colours after they // have been changed by Enable virtual void OnParentEnable( bool WXUNUSED(enable) ) {} @@ -153,27 +149,16 @@ public: // The methods below are required because many native widgets // are composed of several subwidgets and setting a style for // the widget means setting it for all subwidgets as well. - // also, it is nor clear, which native widget is the top + // also, it is not clear which native widget is the top // widget where (most of) the input goes. even tooltips have // to be applied to all subwidgets. virtual GtkWidget* GetConnectWidget(); virtual bool IsOwnGtkWindow( GdkWindow *window ); void ConnectWidget( GtkWidget *widget ); -#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; // MR: Now unused -#endif - #if wxUSE_TOOLTIPS virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); #endif // wxUSE_TOOLTIPS @@ -182,7 +167,7 @@ public: // scrolbar in sync (this does not generate any wx events) void GtkUpdateScrollbar(int orient); - // Called from GTK signales handlers. it indicates that + // Called from GTK signal handlers. it indicates that // the layouting functions have to be called later on // (i.e. in idle time, implemented in OnInternalIdle() ). void GtkUpdateSize() { m_sizeSet = false; } @@ -210,21 +195,7 @@ public: // this widget will be queried for GTK's focus events GtkWidget *m_focusWidget; -#ifdef __WXGTK20__ wxGtkIMData *m_imData; -#else // GTK 1 -#ifdef HAVE_XIM - // XIM support for wxWidgets - GdkIC *m_ic; - GdkICAttr *m_icattr; -#endif // HAVE_XIM -#endif // GTK 2/1 - -#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; @@ -243,10 +214,8 @@ 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 @@ -255,6 +224,7 @@ public: // wxMDIFrame, wxNotebook etc. this is the callback that will get used. wxInsertChildFunction m_insertCallback; +protected: // implement the base class pure virtuals virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const; @@ -267,6 +237,10 @@ public: virtual void DoSetClientSize(int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height); +#if wxUSE_MENUS_NATIVE + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); +#endif // wxUSE_MENUS_NATIVE + virtual void DoCaptureMouse(); virtual void DoReleaseMouse(); @@ -274,16 +248,13 @@ public: virtual void DoSetToolTip( wxToolTip *tip ); #endif // wxUSE_TOOLTIPS -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 @@ -299,6 +270,10 @@ protected: // ApplyWidgetStyle -- override this, not ApplyWidgetStyle virtual void DoApplyWidgetStyle(GtkRcStyle *style); +protected: + // GtkAdjustment to be used by Scroll{Lines,Pages} + void SetVScrollAdjustment(GtkAdjustment* adj); + private: DECLARE_DYNAMIC_CLASS(wxWindowGTK) DECLARE_NO_COPY_CLASS(wxWindowGTK)