X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5bc3865fdf3e584c4d6998572aa6d03f9c0cd422..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk1/window.h diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index ba05d1b3f2..f80dd7b645 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/window.h +// Name: wx/gtk1/window.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -18,7 +18,7 @@ struct wxGtkIMData; // callback definition for inserting a window (internal) //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxWindowGTK; +class WXDLLIMPEXP_FWD_CORE wxWindowGTK; typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* ); //----------------------------------------------------------------------------- @@ -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(); @@ -57,7 +57,9 @@ public: virtual void Lower(); virtual bool Show( bool show = true ); - virtual bool Enable( bool enable = true ); + virtual void DoEnable( bool enable ); + + virtual void SetWindowStyleFlag( long style ); virtual bool IsRetained() const; @@ -106,10 +108,7 @@ public: virtual void SetDropTarget( wxDropTarget *dropTarget ); #endif // wxUSE_DRAG_AND_DROP -#ifdef __WXGTK20__ - virtual void AddChild( wxWindowBase *child ); - virtual void RemoveChild( wxWindowBase *child ); -#endif + virtual bool IsDoubleBuffered() const { return false; } // implementation // -------------- @@ -127,11 +126,6 @@ public: // For compatibility across platforms (not in event table) void OnIdle(wxIdleEvent& WXUNUSED(event)) {} - // wxGTK-specific: called recursively by Enable, - // to give widgets an oppprtunity to correct their colours after they - // have been changed by Enable - virtual void OnParentEnable( bool WXUNUSED(enable) ) {} - // Used by all window classes in the widget creation process. bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size ); void PostCreation(); @@ -151,27 +145,13 @@ 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 @@ -180,7 +160,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; } @@ -208,21 +188,15 @@ 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; @@ -241,10 +215,6 @@ 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 @@ -276,13 +246,6 @@ 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,