X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/082b27986b4f0f6751c1482992fc0d9eae5a931e..8cfc5426cf50da368022813a04e29cf8ec5478a4:/include/wx/gtk1/window.h?ds=sidebyside diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 6730525a86..914a9a045a 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -62,7 +62,7 @@ public: virtual void SetFocus(); virtual bool AcceptsFocus() const; - virtual bool Reparent( wxWindow *newParent ); + virtual bool Reparent( wxWindowBase *newParent ); virtual void WarpPointer(int x, int y); virtual void CaptureMouse(); @@ -86,7 +86,7 @@ public: const wxFont *theFont = (const wxFont *) NULL) const; - virtual bool PopupMenu( wxMenu *menu, int x, int y ); + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); virtual void SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh = TRUE ); @@ -106,12 +106,6 @@ public: virtual WXWidget GetHandle() const { return m_widget; } - // also sets the global flag - void SetScrolling(bool scroll); - - bool HasScrolling() const { return m_hasScrolling; } - bool IsScrolling() const { return m_isScrolling; } - /* I don't want users to override what's done in idle so everything that has to be done in idle time in order for wxGTK to work is done in OnInternalIdle */ @@ -120,13 +114,14 @@ public: /* For compatibility across platforms (not in event table) */ void OnIdle(wxIdleEvent& WXUNUSED(event)) {}; - /* used by all classes in the widget creation process */ - void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos, - const wxSize &size, long style, const wxString &name ); + /* used by all window classes in the widget creation process */ + bool PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize &size ); void PostCreation(); - void InsertChild(wxWindow *child) { (*m_insertCallback)(this, child); } - void DoAddChild(wxWindow *child) { AddChild(child); InsertChild(child); } + /* internal addition of child windows. differs from class + to class not by using virtual functions but by using + the m_insertCallback */ + void DoAddChild(wxWindow *child); /* the methods below are required because many native widgets are composed of several subwidgets and setting a style for @@ -139,14 +134,14 @@ public: virtual bool IsOwnGtkWindow( GdkWindow *window ); void ConnectWidget( GtkWidget *widget ); - // creates a new widget style if none is there - // and sets m_widgetStyle to this value. + /* creates a new widget style if none is there + and sets m_widgetStyle to this value. */ GtkStyle *GetWidgetStyle(); - // called by SetFont() and SetXXXColour etc + /* called by SetFont() and SetXXXColour etc */ void SetWidgetStyle(); - // overridden in many GTK widgets + /* overridden in many GTK widgets */ virtual void ApplyWidgetStyle(); #if wxUSE_TOOLTIPS @@ -156,51 +151,50 @@ public: // called from GTK signales handlers. it indicates that // the layouting functions have to be called later on // (i.e. in idle time, implemented in OnInternalIdle() ). - void UpdateSize() { m_sizeSet = FALSE; } + void GtkUpdateSize() { m_sizeSet = FALSE; } // position and size of the window int m_x, m_y; int m_width, m_height; + int m_oldClientWidth,m_oldClientHeight; - // see the docs in src/gtk/window.cpp + /* see the docs in src/gtk/window.cpp */ GtkWidget *m_widget; GtkWidget *m_wxwindow; - // scrolling stuff +#if HAVE_XIM + /* XIM support for wxWindows */ + GdkIC *m_ic; + GdkICAttr *m_icattr; +#endif + + /* scrolling stuff */ GtkAdjustment *m_hAdjust,*m_vAdjust; float m_oldHorizontalPos; float m_oldVerticalPos; - // we need an extra XGC flag set to get exposed - // events from overlapping children upon moving - // them. this flag will be set in this GC and - // the GC will be used in wxWindow::ScrollWindow(). - GdkGC *m_scrollGC; - // extra (wxGTK-specific) flags - bool m_needParent:1; /* ! wxFrame, wxDialog, wxNotebookPage ? */ + bool m_needParent:1; /* ! wxFrame, wxDialog, wxNotebookPage ? */ + bool m_noExpose:1; /* wxGLCanvas has its own redrawing */ + bool m_nativeSizeEvent:1; /* wxGLCanvas sends wxSizeEvent upon "alloc_size" */ bool m_hasScrolling:1; - bool m_isScrolling:1; bool m_hasVMT:1; bool m_sizeSet:1; bool m_resizing:1; - bool m_isStaticBox:1; /* faster than IS_KIND_OF */ - bool m_isFrame:1; /* faster than IS_KIND_OF */ - bool m_acceptsFocus:1; /* ! wxStaticBox etc. */ + bool m_isStaticBox:1; /* faster than IS_KIND_OF */ + bool m_isRadioButton:1; /* faster than IS_KIND_OF */ + bool m_isFrame:1; /* faster than IS_KIND_OF */ + bool m_acceptsFocus:1; /* not wxStaticBox, not wxStaticBitmap etc. */ + bool m_isScrolling; + bool m_clipPaintRegion; /* TRUE after ScrollWindow() */ + bool m_queuedFullRedraw; /* TRUE after DoMoveWindow */ // these are true if the style were set before the widget was realized // (typcally in the constructor) but the actual GTK style must not be set // before the widget has been "realized" - bool m_delayedFont:1; bool m_delayedForegroundColour:1; bool m_delayedBackgroundColour:1; - bool m_delayedCursor:1; - // the cursor is set in OnInternalIdle(). this fields holds - // a reference to the cursor currently set in theGdk window - // so that we don't have to set it more than once - wxCursor m_currentGdkCursor; - // contains GTK's widgets internal information about non-default widget // font and colours. we create one for each widget that gets any // non-default attribute set via SetFont() or SetForegroundColour() / @@ -222,6 +216,7 @@ public: int width, int height, int sizeFlags = wxSIZE_AUTO); virtual void DoSetClientSize(int width, int height); + virtual void DoMoveWindow(int x, int y, int width, int height); #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip );