X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..26531700c7ec84872c60899ce6219954499086da:/include/wx/motif/window.h diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h index 2e0dbaa1ac..dd190b6bf4 100644 --- a/include/wx/motif/window.h +++ b/include/wx/motif/window.h @@ -12,7 +12,7 @@ #ifndef _WX_WINDOW_H_ #define _WX_WINDOW_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "window.h" #endif @@ -57,16 +57,15 @@ public: virtual void Raise(); virtual void Lower(); - virtual bool Show( bool show = TRUE ); - virtual bool Enable( bool enable = TRUE ); + virtual bool Show( bool show = true ); + virtual bool Enable( bool enable = true ); virtual void SetFocus(); virtual void WarpPointer(int x, int y); - virtual void Refresh( bool eraseBackground = TRUE, + virtual void Refresh( bool eraseBackground = true, const wxRect *rect = (const wxRect *) NULL ); - virtual void Clear(); virtual bool SetBackgroundColour( const wxColour &colour ); virtual bool SetForegroundColour( const wxColour &colour ); @@ -84,8 +83,8 @@ public: 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 ); + 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; @@ -98,7 +97,7 @@ public: // Accept files for dragging virtual void DragAcceptFiles(bool accept); - + // Get the unique identifier of a window virtual WXWidget GetHandle() const { return GetMainWidget(); } @@ -122,6 +121,7 @@ public: virtual WXWidget GetTopWidget() const; // Get the underlying X window and display + WXWindow GetClientXWindow() const; WXWindow GetXWindow() const; WXDisplay *GetXDisplay() const; @@ -142,27 +142,16 @@ public: // (for wxWindowDC and Motif callbacks only) // ----------------------------------------- - // read/write access to the update rect list - const wxRectList& GetUpdateRects() const { return m_updateRects; } - // 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)); } - - // Empties the m_updateRects list - void ClearUpdateRects(); + void AddUpdateRect(int x, int y, int w, int h); void ClearUpdateRegion() { m_updateRegion.Clear(); } void SetUpdateRegion(const wxRegion& region) { m_updateRegion = region; } - // For implementation purposes - sometimes decorations make the client area - // smaller - virtual wxPoint GetClientAreaOrigin() const; + // Process idle (send update events) + void OnInternalIdle(); protected: - // event handlers (not virtual by design) - void OnIdle(wxIdleEvent& event); - // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -189,6 +178,10 @@ protected: void DoMoveWindowIntr(int x, int y, int width, int height, int flags); + + // helper function, to remove duplicate code, used in wxScrollBar + WXWidget DoCreateScrollBar(WXWidget parent, wxOrientation orientation, + void (*callback)()); public: WXPixmap GetBackingPixmap() const { return m_backingPixmap; } void SetBackingPixmap(WXPixmap pixmap) { m_backingPixmap = pixmap; } @@ -199,7 +192,7 @@ public: // Change properties // Change to the current font (often overridden) - virtual void ChangeFont(bool keepOriginalSize = TRUE); + virtual void ChangeFont(bool keepOriginalSize = true); // Change background and foreground colour using current background colour // setting (Motif generates foreground based on background) @@ -214,12 +207,12 @@ protected: bool DetachWidget(WXWidget widget); // How to implement accelerators. If we find a key event, translate to - // wxWindows wxKeyEvent form. Find a widget for the window. Now find a + // wxWidgets 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. + // window. If it returns true (processed the event), skip the X event, + // otherwise carry on up the wxWidgets 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) @@ -233,7 +226,7 @@ protected: void UnmanageAndDestroy(WXWidget widget); // map or unmap an X widget (passing NULL is ok), - // returns TRUE if widget was mapped/unmapped + // returns true if widget was mapped/unmapped bool MapOrUnmap(WXWidget widget, bool map); // scrolling stuff @@ -265,9 +258,6 @@ protected: long m_lastTS; // last timestamp unsigned m_lastButton:2; // last pressed button - // List of wxRects representing damaged region - wxRectList m_updateRects; - protected: WXWidget m_mainWidget; WXWidget m_hScrollBar; @@ -301,7 +291,7 @@ protected: 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