X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b513212d2eab4daacd56606d6c7d489639e3215b..c65650d7b5472d00da0a0516ff1a2ccf53746319:/include/wx/x11/window.h?ds=sidebyside diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index 77be540790..669e17cd80 100644 --- a/include/wx/x11/window.h +++ b/include/wx/x11/window.h @@ -12,7 +12,7 @@ #ifndef _WX_WINDOW_H_ #define _WX_WINDOW_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "window.h" #endif @@ -62,7 +62,7 @@ public: virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL ); - virtual void Clear(); + virtual void Update(); virtual bool SetBackgroundColour( const wxColour &colour ); virtual bool SetForegroundColour( const wxColour &colour ); @@ -79,18 +79,13 @@ public: const wxFont *theFont = (const wxFont *) NULL) const; - virtual void SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool refresh = TRUE ); - virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE ); - virtual int GetScrollPos( int orient ) const; - virtual int GetScrollThumb( int orient ) const; - virtual int GetScrollRange( int orient ) const; virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL ); - virtual void SetSizeHints(int minW, int minH, + virtual void DoSetSizeHints(int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1); + #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget( wxDropTarget *dropTarget ); #endif // wxUSE_DRAG_AND_DROP @@ -107,30 +102,14 @@ public: // accessors // --------- - // Get main widget for this window, e.g. a text widget + // Get main X11 window virtual WXWindow GetMainWindow() const; - // Get the widget that corresponds to the label (for font setting, label setting etc.) - virtual WXWindow GetLabelWindow() const; - // Get the client widget for this window (something we can create other - // windows on) - virtual WXWindow GetClientWindow() const; - // Get the top widget for this window, e.g. the scrolled widget parent of a - // multi-line text widget. Top means, top in the window hierarchy that - // implements this window. - virtual WXWindow GetTopWindow() const; - - // Get the underlying X window and display - WXWindow GetXWindow() const; - WXDisplay *GetXDisplay() const; - - // called from Motif callbacks - and should only be called from there - - void SetButton1(bool pressed) { m_button1Pressed = pressed; } - void SetButton2(bool pressed) { m_button2Pressed = pressed; } - void SetButton3(bool pressed) { m_button3Pressed = pressed; } + // 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; } @@ -139,25 +118,28 @@ public: // arrange status bar, toolbar etc. virtual bool PreResize(); - // Generates a paint event - virtual void DoPaint(); + // Generates paint events from m_updateRegion + void SendPaintEvents(); - // update rectangle/region manipulation - // (for wxWindowDC and Motif callbacks only) - // ----------------------------------------- + // Generates paint events from flag + void SendNcPaintEvents(); - // read/write access to the update rect list - const wxRectList& GetUpdateRects() const { return m_updateRects; } + // Generates erase events from m_clearRegion + void SendEraseEvents(); - // Adds a recangle to the updates list - void AddUpdateRect(int x, int y, int w, int h) - { m_updateRects.Append(new wxRect(x, y, w, h)); } + // Clip to paint region? + bool GetClipPaintRegion() { return m_clipPaintRegion; } - // Empties the m_updateRects list - void ClearUpdateRects(); + // Return clear region + wxRegion &GetClearRegion() { return m_clearRegion; } - void ClearUpdateRegion() { m_updateRegion.Clear(); } - void SetUpdateRegion(const wxRegion& region) { m_updateRegion = region; } + 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); @@ -167,119 +149,30 @@ public: // smaller virtual wxPoint GetClientAreaOrigin() const; -protected: - // event handlers (not virtual by design) - void OnIdle(wxIdleEvent& event); - - // 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); - - wxWindow *GetChild(int number) const - { return GetChildren().Item(number)->GetData(); } + // 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 wxX11 to work is done in + // OnInternalIdle + virtual void OnInternalIdle(); +protected: // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event); - void SetMainWindow(WXWindow w) { m_mainWidget = w; } - - bool CanAddEventHandler() const { return m_canAddEventHandler; } - void SetCanAddEventHandler(bool flag) { m_canAddEventHandler = flag; } - -public: - WXPixmap GetBackingPixmap() const { return m_backingPixmap; } - void SetBackingPixmap(WXPixmap pixmap) { m_backingPixmap = pixmap; } - int GetPixmapWidth() const { return m_pixmapWidth; } - int GetPixmapHeight() const { return m_pixmapHeight; } - void SetPixmapWidth(int w) { m_pixmapWidth = w; } - void SetPixmapHeight(int h) { m_pixmapHeight = h; } - - // Change properties - virtual void ChangeFont(bool keepOriginalSize = TRUE); // Change to the current font (often overridden) - - // Change background and foreground colour using current background colour - // setting (Motif generates foreground based on background) - virtual void ChangeBackgroundColour(); - // Change foreground colour using current foreground colour setting - virtual void ChangeForegroundColour(); - -protected: - // How to implement accelerators. If we find a key event, translate to - // wxWindows wxKeyEvent form. Find a widget for the window. Now find a - // wxWindow for the widget. If there isn't one, go up the widget hierarchy - // trying to find one. Once one is found, call ProcessAccelerator for the - // window. If it returns TRUE (processed the event), skip the X event, - // otherwise carry on up the wxWindows window hierarchy calling - // ProcessAccelerator. If all return FALSE, process the X event as normal. - // Eventually we can implement OnCharHook the same way, but concentrate on - // accelerators for now. ProcessAccelerator must look at the current - // accelerator table, and try to find what menu id or window (beneath it) - // has this ID. Then construct an appropriate command - // event and send it. -public: - virtual bool ProcessAccelerator(wxKeyEvent& event); - -protected: - // scrolling stuff - // --------------- - - // create/destroy window scrollbars - void CreateScrollbar(wxOrientation orientation); - void DestroyScrollbar(wxOrientation orientation); - - // get either hor or vert scrollbar widget - WXWindow GetScrollbar(wxOrientation orient) const - { return orient == wxHORIZONTAL ? m_hScrollBar : m_vScrollBar; } - - // set the scroll pos - void SetInternalScrollPos(wxOrientation orient, int pos) - { - if ( orient == wxHORIZONTAL ) - m_scrollPosX = pos; - else - m_scrollPosY = pos; - } - - // Motif-specific flags - // -------------------- - - bool m_needsRefresh:1; // repaint backing store? - bool m_canAddEventHandler:1; // ??? - bool m_button1Pressed:1; - bool m_button2Pressed:1; - bool m_button3Pressed:1; - // For double-click detection long m_lastTS; // last timestamp int m_lastButton; // last pressed button - // List of wxRects representing damaged region - wxRectList m_updateRects; - protected: - WXWindow m_mainWidget; - WXWindow m_hScrollBar; - WXWindow m_vScrollBar; - WXWindow m_borderWidget; - WXWindow m_scrolledWindow; - WXWindow m_drawingArea; + WXWindow m_mainWindow; + WXWindow m_clientWindow; + bool m_insertIntoMain; + bool m_winCaptured; - bool m_hScroll; - bool m_vScroll; - WXPixmap m_backingPixmap; - int m_pixmapWidth; - int m_pixmapHeight; - int m_pixmapOffsetX; - int m_pixmapOffsetY; - - // Store the last scroll pos, since in wxWin the pos isn't set automatically - // by system - int m_scrollPosX; - int m_scrollPosY; + wxRegion m_clearRegion; + bool m_clipPaintRegion; + bool m_updateNcArea; + bool m_needsInputFocus; // Input focus set in OnIdle - // Window border size - int m_borderSize; - // implement the base class pure virtuals virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const; @@ -291,11 +184,9 @@ protected: int sizeFlags = wxSIZE_AUTO); virtual void DoSetClientSize(int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height); - virtual bool DoPopupMenu(wxMenu *menu, int x, int y); - virtual void DoCaptureMouse(); virtual void DoReleaseMouse(); - + #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip ); #endif // wxUSE_TOOLTIPS