typo fixes

[wxWidgets.git] / include / wx / x11 / window.h

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index d4cabf0cbcf4330cb28ba5742cd0830701f72fa0..feace83629c6736762616ab635cd0c45b61109f1 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -22,15 +22,15 @@
 // wxWindow class for Motif - see also wxWindowBase
 // ----------------------------------------------------------------------------
 
 // wxWindow class for Motif - see also wxWindowBase
 // ----------------------------------------------------------------------------
 

-class wxWindow : public wxWindowBase
+class wxWindowX11 : public wxWindowBase

 {
     friend class WXDLLEXPORT wxDC;
     friend class WXDLLEXPORT wxWindowDC;
     
 public:
 {
     friend class WXDLLEXPORT wxDC;
     friend class WXDLLEXPORT wxWindowDC;
     
 public:

-    wxWindow() { Init(); }
+    wxWindowX11() { Init(); }

     
     

-    wxWindow(wxWindow *parent,
+    wxWindowX11(wxWindow *parent,

         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,


@@ -41,7 +41,7 @@ public:
         Create(parent, id, pos, size, style, name);
     }
     
         Create(parent, id, pos, size, style, name);
     }
     

-    virtual ~wxWindow();
+    virtual ~wxWindowX11();

     
     bool Create(wxWindow *parent,
         wxWindowID id,
     
     bool Create(wxWindow *parent,
         wxWindowID id,


@@ -50,10 +50,6 @@ public:
         long style = 0,
         const wxString& name = wxPanelNameStr);
     
         long style = 0,
         const wxString& name = wxPanelNameStr);
     

-    // implement base class pure virtuals
-    virtual void SetTitle( const wxString& title);
-    virtual wxString GetTitle() const;
-    

     virtual void Raise();
     virtual void Lower();
     
     virtual void Raise();
     virtual void Lower();
     


@@ -66,6 +62,8 @@ public:
     
     virtual void Refresh( bool eraseBackground = TRUE,
         const wxRect *rect = (const wxRect *) NULL );
     
     virtual void Refresh( bool eraseBackground = TRUE,
         const wxRect *rect = (const wxRect *) NULL );

+    virtual void Update();
+    

     virtual void Clear();
     
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual void Clear();
     
     virtual bool SetBackgroundColour( const wxColour &colour );


@@ -83,12 +81,6 @@ public:
         const wxFont *theFont = (const wxFont *) NULL)
         const;
     
         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 ScrollWindow( int dx, int dy,
         const wxRect* rect = (wxRect *) NULL );
     


@@ -103,7 +95,7 @@ public:
     virtual void DragAcceptFiles(bool accept);
     
     // Get the unique identifier of a window
     virtual void DragAcceptFiles(bool accept);
     
     // Get the unique identifier of a window

-    virtual WXWidget GetHandle() const { return GetMainWidget(); }
+    virtual WXWindow GetHandle() const { return GetMainWindow(); }

     
     // implementation from now on
     // --------------------------
     
     // implementation from now on
     // --------------------------


@@ -111,30 +103,14 @@ public:
     // accessors
     // ---------
     
     // accessors
     // ---------
     

-    // 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.)
-    virtual WXWidget GetLabelWidget() const;
-    // Get the client widget for this window (something we can create other
-    // windows on)
-    virtual WXWidget GetClientWidget() 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 WXWidget GetTopWidget() const;
-    
-    // Get the underlying X window and display
-    WXWindow GetXWindow() const;
-    WXDisplay *GetXDisplay() const;
+    // Get main X11 window
+    virtual WXWindow GetMainWindow() 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 GetClientWindow() const;

     
     void SetLastClick(int button, long timestamp)
     
     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; }
     
     int GetLastClickedButton() const { return m_lastButton; }
     long GetLastClickTime() const { return m_lastTS; }


@@ -143,165 +119,64 @@ public:
     // arrange status bar, toolbar etc.
     virtual bool PreResize();
     
     // arrange status bar, toolbar etc.
     virtual bool PreResize();
     

-    // Generates a paint event
-    virtual void DoPaint();
+    // Generates paint events from m_updateRegion
+    void SendPaintEvents();
+    
+    // Generates paint events from flag
+    void SendNcPaintEvents();

     
     

-    // update rectangle/region manipulation
-    // (for wxWindowDC and Motif callbacks only)
-    // -----------------------------------------
+    // Generates erase events from m_clearRegion
+    void SendEraseEvents();

     
     

-    // read/write access to the update rect list
-    const wxRectList& GetUpdateRects() const { return m_updateRects; }
+    // Clip to paint region?
+    bool GetClipPaintRegion() { return m_clipPaintRegion; }

     
     

-    // 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)); }
+    // Return clear region
+    wxRegion &GetClearRegion() { return m_clearRegion; }

     
     

-    // Empties the m_updateRects list
-    void ClearUpdateRects();
+    void NeedUpdateNcAreaInIdle( bool update = TRUE ) { m_updateNcArea = update; }

     
     

-    void ClearUpdateRegion() { m_updateRegion.Clear(); }
-    void SetUpdateRegion(const wxRegion& region) { m_updateRegion = region; }
+    // 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
     
     // 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);
+    static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour);
+    static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = FALSE);

     
     // For implementation purposes - sometimes decorations make the client area
     // smaller
     virtual wxPoint GetClientAreaOrigin() const;
     
     
     // For implementation purposes - sometimes decorations make the client area
     // 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);
+    // 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();

     
     

-    wxWindow *GetChild(int number) const
-    { return GetChildren().Item(number)->GetData(); }
+    // For compatibility across platforms (not in event table)
+    void OnIdle(wxIdleEvent& WXUNUSED(event)) {}

     
     

+protected:

     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     

-    // Motif-specific
-    
-    // CanvasXXXSiize functions
-    void CanvasGetSize(int* width, int* height) const; // If have drawing area
-    void CanvasGetClientSize(int *width, int *height) const;
-    void CanvasGetPosition(int *x, int *y) const; // If have drawing area
-    void CanvasSetClientSize(int width, int size);
-    void CanvasSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    
-    void SetMainWidget(WXWidget 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:
-    // Adds the widget to the hash table and adds event handlers.
-    bool AttachWidget(wxWindow* parent, WXWidget mainWidget,
-        WXWidget formWidget, int x, int y, int width, int height);
-    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
-    // 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:
-    // 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
-    bool MapOrUnmap(WXWidget widget, bool map);
-    
-    // scrolling stuff
-    // ---------------
-    
-    // create/destroy window scrollbars
-    void CreateScrollbar(wxOrientation orientation);
-    void DestroyScrollbar(wxOrientation orientation);
-    
-    // get either hor or vert scrollbar widget
-    WXWidget 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
     
     // 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:
 protected:

-    WXWidget              m_mainWidget;
-    WXWidget              m_hScrollBar;
-    WXWidget              m_vScrollBar;
-    WXWidget              m_borderWidget;
-    WXWidget              m_scrolledWindow;
-    WXWidget              m_drawingArea;
-    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;
+    WXWindow              m_mainWindow;
+    WXWindow              m_clientWindow;
+    bool                  m_insertIntoMain;

     
     

+    bool                  m_winCaptured;
+    wxRegion              m_clearRegion;
+    bool                  m_clipPaintRegion;
+    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;
     virtual void DoScreenToClient( int *x, int *y ) const;
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;


@@ -313,11 +188,9 @@ protected:
         int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
     virtual void DoMoveWindow(int x, int y, 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);

-    virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
-    

     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();

-    
+

 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS


@@ -326,8 +199,8 @@ private:
     // common part of all ctors
     void Init();
     
     // common part of all ctors
     void Init();
     

-    DECLARE_DYNAMIC_CLASS(wxWindow)
-    DECLARE_NO_COPY_CLASS(wxWindow)
+    DECLARE_DYNAMIC_CLASS(wxWindowX11)
+    DECLARE_NO_COPY_CLASS(wxWindowX11)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };