X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90e572f1e5af1e51fd14e2e1e6f64fa3e258e590..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/gtk1/window.h?ds=sidebyside diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 606b6385fc..388f06fd91 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$ @@ -10,6 +10,12 @@ #ifndef __GTKWINDOWH__ #define __GTKWINDOWH__ +typedef struct _GtkTooltips GtkTooltips; +#ifdef HAVE_XIM +typedef struct _GdkIC GdkIC; +typedef struct _GdkICAttr GdkICAttr; +#endif + // helper structure that holds class that holds GtkIMContext object and // some additional data needed for key events processing struct wxGtkIMData; @@ -18,7 +24,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 +54,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 +63,7 @@ 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 ); @@ -84,16 +90,6 @@ public: virtual int GetCharHeight() const; virtual int GetCharWidth() const; - virtual void GetTextExtent(const wxString& string, - int *x, int *y, - int *descent = (int *) NULL, - int *externalLeading = (int *) NULL, - 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 ); @@ -102,16 +98,15 @@ public: virtual int GetScrollThumb( int orient ) const; virtual int GetScrollRange( int orient ) const; virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = (wxRect *) NULL ); + const wxRect* rect = NULL ); #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 + virtual bool IsDoubleBuffered() const { return false; } + + GdkWindow* GTKGetDrawingWindow() const; // implementation // -------------- @@ -123,17 +118,12 @@ public: // OnInternalIdle virtual void OnInternalIdle(); - // Internal represention of Update() + // Internal representation of Update() void GtkUpdate(); // For compatibility across platforms (not in event table) void OnIdle(wxIdleEvent& WXUNUSED(event)) {} - // wxGTK-specific: called recursively by Enable, - // to give widgets an opportunity 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(); @@ -160,20 +150,6 @@ public: 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 @@ -183,7 +159,7 @@ public: void GtkUpdateScrollbar(int orient); // Called from GTK signal handlers. it indicates that - // the layouting functions have to be called later on + // the layout functions have to be called later on // (i.e. in idle time, implemented in OnInternalIdle() ). void GtkUpdateSize() { m_sizeSet = false; } @@ -210,21 +186,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; @@ -243,10 +213,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 @@ -256,6 +222,16 @@ public: wxInsertChildFunction m_insertCallback; // implement the base class pure virtuals + virtual void DoGetTextExtent(const wxString& string, + int *x, int *y, + int *descent = NULL, + int *externalLeading = NULL, + const wxFont *theFont = NULL) const; + +#if wxUSE_MENUS_NATIVE + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); +#endif // wxUSE_MENUS_NATIVE + virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const; virtual void DoGetPosition( int *x, int *y ) const; @@ -278,13 +254,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, @@ -301,7 +270,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxWindowGTK) - DECLARE_NO_COPY_CLASS(wxWindowGTK) + wxDECLARE_NO_COPY_CLASS(wxWindowGTK); }; extern WXDLLIMPEXP_CORE wxWindow *wxFindFocusedChild(wxWindowGTK *win);