untested changes...

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

diff --git a/user/wxLayout/wxlwindow.h b/user/wxLayout/wxlwindow.h
index 98d0d61903362d126d2ca04dfeafeea4550486a9..00b50ed3a7071b45b640137e97eada6ee580db30 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
 };
 
 /**
@@ -64,20 +65,7 @@ public:
               int weight=wxNORMAL,
               int underline=0,
               wxColour *fg=NULL,
-              wxColour *bg=NULL)
-      {
-         GetLayoutList()->Clear(family,size,style,weight,underline,fg,bg);
-         SetBackgroundColour(GetLayoutList()->GetDefaults()->GetBGColour());
-         ResizeScrollbars(true);
-         SetDirty();
-         SetModified(false);
-         wxRect r;
-         int w,h;
-         r.x = r.y = 0; GetSize(&w,&h);
-         r.width = w;
-         r.height = h;
-         DoPaint(&r);
-      }
+              wxColour *bg=NULL);
    /** Sets a background image, only used on screen, not on printouts.
        @param bitmap a pointer to a wxBitmap or NULL to remove it
    */
@@ -92,8 +80,14 @@ public:
    bool IsEditable(void) const { return m_Editable; }
    /// Pastes text from clipboard.
    void Paste(void);
-   
+   /// Copies selection to clipboard.
+   bool Copy(void);
+   /// Copies selection to clipboard and deletes it.
+   bool Cut(void);
    //@}
+
+   bool Find(const wxString &needle,
+             wxPoint * fromWhere = NULL);
    
    void EnablePopup(bool enable = true) { m_DoPopupMenu = enable; }
 
@@ -127,10 +121,12 @@ public:
    //@{
    void OnPaint(wxPaintEvent &event);
    void OnChar(wxKeyEvent& event);
+   void OnKeyUp(wxKeyEvent& event);
    void OnMenu(wxCommandEvent& event);
    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);
    //@}
@@ -157,7 +153,8 @@ public:
 protected:   
    /// generic function for mouse events processing
    void OnMouse(int eventId, wxMouseEvent& event);
-
+   /// as the name says
+   void ScrollToCursor(void);
    /// for sending events
    wxWindow *m_Parent;
    /// Shall we send events?
@@ -170,6 +167,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