X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66f8b9ace213e02e184460e0c1a212cacea27edd..5180055b697078e8c6ec7db485f1f1bfa3e91abd:/include/wx/motif/window.h?ds=sidebyside diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h index d0cb75935e..70857eb954 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_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "window.h" #endif @@ -110,7 +110,8 @@ public: // Get main widget for this window, e.g. a text widget virtual WXWidget GetMainWidget() const; - // Get the widget that corresponds to the label (for font setting, label setting etc.) + // Get the widget that corresponds to the label (for font setting, + // label setting etc.) virtual WXWidget GetLabelWidget() const; // Get the client widget for this window (something we can create other // windows on) @@ -124,20 +125,14 @@ public: 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; } - void SetLastClick(int button, long timestamp) { m_lastButton = button; m_lastTS = timestamp; } int GetLastClickedButton() const { return m_lastButton; } long GetLastClickTime() const { return m_lastTS; } - // Gives window a chance to do something in response to a size message, e.g. - // arrange status bar, toolbar etc. + // Gives window a chance to do something in response to a size message, + // e.g. arrange status bar, toolbar etc. virtual bool PreResize(); // Generates a paint event @@ -147,34 +142,20 @@ 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; } - // sets the fore/background colour for the given widget - static void DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour); - static void DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE); - // 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); - - wxWindow *GetChild(int number) const - { return GetChildren().Item(number)->GetData(); } - // Responds to colour changes: passes event on to children. void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -182,9 +163,6 @@ protected: void SetMainWidget(WXWidget w) { m_mainWidget = w; } - bool CanAddEventHandler() const { return m_canAddEventHandler; } - void SetCanAddEventHandler(bool flag) { m_canAddEventHandler = flag; } - // See src/motif/window.cpp, near the top, for an explanation // why this is necessary void CanvasSetSizeIntr(int x, int y, int width, int height, @@ -204,6 +182,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; } @@ -213,7 +195,8 @@ public: void SetPixmapHeight(int h) { m_pixmapHeight = h; } // Change properties - virtual void ChangeFont(bool keepOriginalSize = TRUE); // Change to the current font (often overridden) + // Change to the current font (often overridden) + virtual void ChangeFont(bool keepOriginalSize = TRUE); // Change background and foreground colour using current background colour // setting (Motif generates foreground based on background) @@ -246,8 +229,8 @@ protected: // unmanage and destroy an X widget f it's !NULL (passing NULL is ok) void UnmanageAndDestroy(WXWidget widget); - // map or unmap an X widget (passing NULL is ok), returns TRUE if widget was - // mapped/unmapped + // map or unmap an X widget (passing NULL is ok), + // returns TRUE if widget was mapped/unmapped bool MapOrUnmap(WXWidget widget, bool map); // scrolling stuff @@ -274,17 +257,10 @@ protected: // -------------------- 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; + long m_lastTS; // last timestamp + unsigned m_lastButton:2; // last pressed button protected: WXWidget m_mainWidget; @@ -293,17 +269,15 @@ protected: WXWidget m_borderWidget; WXWidget m_scrolledWindow; WXWidget m_drawingArea; - bool m_winCaptured; - bool m_hScroll; - bool m_vScroll; + bool m_winCaptured:1; 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 + // Store the last scroll pos, since in wxWin the pos isn't set + // automatically by system int m_scrollPosX; int m_scrollPosY; @@ -343,7 +317,8 @@ private: // undesired effects. // // Usage: create an instance of this class on the stack to disable the size -// optimisation, it will be reenabled as soon as the object goes out from scope. +// optimisation, it will be reenabled as soon as the object goes out +// from scope. // ---------------------------------------------------------------------------- class WXDLLEXPORT wxNoOptimize