egcs compilation fix

[wxWidgets.git] / user / wxLayout / wxlwindow.h

diff --git a/user/wxLayout/wxlwindow.h b/user/wxLayout/wxlwindow.h
index a5f7a7ee8d13ceac843d822580f8085e6f8f5952..0cce930123000659f7bee4b3bc5f99942a0a7bae 100644 (file)
--- a/user/wxLayout/wxlwindow.h
+++ b/user/wxLayout/wxlwindow.h
@@ -38,7 +38,8 @@ enum
    WXLOWIN_MENU_RCLICK,
    WXLOWIN_MENU_LCLICK,
    WXLOWIN_MENU_DBLCLICK,
-   WXLOWIN_MENU_LAST = WXLOWIN_MENU_DBLCLICK
+   WXLOWIN_MENU_MOUSEMOVE,
+   WXLOWIN_MENU_LAST = WXLOWIN_MENU_MOUSEMOVE
 };
 
 /**
@@ -63,15 +64,20 @@ public:
               int style=wxNORMAL,
               int weight=wxNORMAL,
               int underline=0,
-              char const *fg="black",
-              char const *bg="white")
+              wxColour *fg=NULL,
+              wxColour *bg=NULL)
       {
          GetLayoutList()->Clear(family,size,style,weight,underline,fg,bg);
-         SetBackgroundColour(*GetLayoutList()->GetDefaults()->GetBGColour());
+         SetBackgroundColour(GetLayoutList()->GetDefaults()->GetBGColour());
          ResizeScrollbars(true);
          SetDirty();
          SetModified(false);
-         DoPaint();
+         wxRect r;
+         int w,h;
+         r.x = r.y = 0; GetSize(&w,&h);
+         r.width = w;
+         r.height = h;
+         DoPaint(&r);
       }
    /** Sets a background image, only used on screen, not on printouts.
        @param bitmap a pointer to a wxBitmap or NULL to remove it
@@ -100,10 +106,8 @@ public:
    /** Redraws the window.
        Internally, this stores the parameter and calls a refresh on
        wxMSW, draws directly on wxGTK.
-       @param scrollToCursor if true, scroll the window so that the
-       cursor becomes visible
    */
-   void DoPaint(bool scrollToCursor = false);
+   void DoPaint(const wxRect *updateRect);
 
 #ifdef __WXMSW__
    virtual long MSWGetDlgCode();
@@ -128,6 +132,7 @@ public:
    void OnLeftMouseClick(wxMouseEvent& event)  { OnMouse(WXLOWIN_MENU_LCLICK, event); }
    void OnRightMouseClick(wxMouseEvent& event) { OnMouse(WXLOWIN_MENU_RCLICK, event); }
    void OnMouseDblClick(wxMouseEvent& event)   { OnMouse(WXLOWIN_MENU_DBLCLICK, event); }
+   void OnMouseMove(wxMouseEvent &event)       { OnMouse(WXLOWIN_MENU_MOUSEMOVE, event) ; }
    void OnSetFocus(wxFocusEvent &ev);
    void OnKillFocus(wxFocusEvent &ev);
    //@}
@@ -144,7 +149,7 @@ public:
    void ResetDirty(void) { m_Dirty = false; }
    //@}
    /// Redraws the window, used by DoPaint() or OnPaint().
-   void InternalPaint(void);
+   void InternalPaint(const wxRect *updateRect);
 
    /// Has list been modified/edited?
    bool IsModified(void) const { return m_Modified; }
@@ -167,6 +172,8 @@ protected:
    bool m_DoPopupMenu;
    /// Should InternalPaint() scroll to cursor.
    bool m_ScrollToCursor;
+   /// Do we currently have a non-standard cursor?
+   bool m_HandCursor;
    /// the menu
    wxMenu * m_PopupMenu;
    /// for derived classes, set when mouse is clicked
@@ -180,6 +187,8 @@ private:
    wxLayoutList *m_llist;
    /// Can user edit the window?
    bool m_Editable;
+   /// Are we currently building a selection with the keyboard?
+   bool m_Selecting;
    /// wrap margin
    CoordType    m_WrapMargin;
    /// Is list dirty (for redraws, internal use)?