X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d1dff0172e94487c4aa2d830c714f93be73c7ec..2fda2145700445519a0ce539b04dc72bae180124:/include/wx/x11/window.h?ds=sidebyside diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index f79d378d50..f6c76873d3 100644 --- a/include/wx/x11/window.h +++ b/include/wx/x11/window.h @@ -103,15 +103,14 @@ public: // accessors // --------- - // Get main widget for this window, e.g. a text widget + // Get main X11 window virtual WXWindow GetMainWindow() const; - // Get the underlying X window and display - WXWindow GetXWindow() const; - WXDisplay *GetXDisplay() const; - + // Get X11 window representing the client area + virtual WXWindow GetClientAreaWindow() const; + void SetLastClick(int button, long timestamp) - { m_lastButton = button; m_lastTS = timestamp; } + { m_lastButton = button; m_lastTS = timestamp; } int GetLastClickedButton() const { return m_lastButton; } long GetLastClickTime() const { return m_lastTS; } @@ -120,12 +119,29 @@ public: // arrange status bar, toolbar etc. virtual bool PreResize(); - // Generates paint events - void X11SendPaintEvents(); + // Generates paint events from m_updateRegion + void SendPaintEvents(); + + // Generates paint events from flag + void SendNcPaintEvents(); + + // Generates erase events from m_clearRegion + void SendEraseEvents(); // Clip to paint region? bool GetClipPaintRegion() { return m_clipPaintRegion; } + // Return clear region + wxRegion &GetClearRegion() { return m_clearRegion; } + + void NeedUpdateNcAreaInIdle( bool update = TRUE ) { m_updateNcArea = update; } + + // Inserting into main window instead of client + // window. This is mostly for a wxWindow's own + // scrollbars. + void SetInsertIntoMain( bool insert = TRUE ) { m_insertIntoMain = insert; } + bool GetInsertIntoMain() { return m_insertIntoMain; } + // sets the fore/background colour for the given widget static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour); static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = FALSE); @@ -143,10 +159,6 @@ public: void OnIdle(wxIdleEvent& WXUNUSED(event)) {} protected: - // Makes an adjustment to the window position (for example, a frame that has - // a toolbar that it manages itself). - virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags); - // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -155,12 +167,15 @@ protected: int m_lastButton; // last pressed button protected: - WXWindow m_mainWidget; + WXWindow m_mainWindow; + WXWindow m_clientWindow; + bool m_insertIntoMain; + bool m_winCaptured; wxRegion m_clearRegion; bool m_clipPaintRegion; - - bool m_winCaptured; // ???? + bool m_updateNcArea; + bool m_needsInputFocus; // Input focus set in OnIdle // implement the base class pure virtuals virtual void DoClientToScreen( int *x, int *y ) const;