getting rid of warnings

[wxWidgets.git] / samples / richedit / wxlwindow.h

diff --git a/samples/richedit/wxlwindow.h b/samples/richedit/wxlwindow.h
index 5453903a235d8fc1e53d102bb1996a9fa83f8a3f..8958e62fab72b712c575a929d6e2e3c87a50a8af 100644 (file)
--- a/samples/richedit/wxlwindow.h
+++ b/samples/richedit/wxlwindow.h
@@ -1,7 +1,7 @@
 /*-*- c++ -*-********************************************************
  * wxLwindow.h : a scrolled Window for displaying/entering rich text*
  *                                                                  *
- * (C) 1998-1999 by Karsten Ballüder (karsten@phy.hw.ac.uk)         *
+ * (C) 1998-2000 by Karsten Ballüder (ballueder@gmx.net)            *
  *                                                                  *
  * $Id$
  *******************************************************************/
@@ -23,8 +23,6 @@
 #endif
 
 
-#define wxUSE_PRIVATE_CLIPBOARD_FORMAT 0
-
 enum
 {
    WXLOWIN_MENU_LARGER = WXLOWIN_MENU_FIRST,
@@ -97,24 +95,21 @@ public:
       m_CursorVisibility = visibility; return v;}
 
    /// Pastes text from clipboard.
-   void Paste(bool usePrimarySelection = FALSE);
+   void Paste(bool privateFormat = FALSE, bool usePrimarySelection = FALSE);
    /** Copies selection to clipboard.
        @param invalidate used internally, see wxllist.h for details
    */
-   bool Copy(bool invalidate = true);
+   bool Copy(bool invalidate = true, bool privateFormat = FALSE, bool primary = FALSE);
    /// Copies selection to clipboard and deletes it.
-   bool Cut(void);
+   bool Cut(bool privateFormat = FALSE, bool usePrimary = FALSE);
    //@}
 
-#ifdef M_BASEDIR
    /// find string in buffer
    bool Find(const wxString &needle,
              wxPoint * fromWhere = NULL,
              const wxString &configPath = "MsgViewFindString");
    /// find the same string again
    bool FindAgain(void);
-#endif
-   
 
    void EnablePopup(bool enable = true) { m_DoPopupMenu = enable; }
 
@@ -123,6 +118,11 @@ public:
    */
    void SetWrapMargin(CoordType margin) { m_WrapMargin = margin; }
 
+   /** Toggle wordwrap as we type.
+       @param on true to activate word wrap
+   */
+   void SetWordWrap(bool on = true) { m_DoWordWrap = on; }
+   
    /** Redraws the window.
        Internally, this stores the parameter and calls a refresh on
        wxMSW, draws directly on wxGTK.
@@ -235,6 +235,10 @@ protected:
    int m_maxx;
    int m_maxy;
    int m_lineHeight;
+   /// do we want automatic word wrap?
+   bool m_DoWordWrap;
+   /// wrap margin
+   CoordType    m_WrapMargin;
 
    /// do we have the corresponding scrollbar?
    bool m_hasHScrollbar,
@@ -258,8 +262,6 @@ private:
    bool m_Editable;
    /// Are we currently building a selection with the keyboard?
    bool m_Selecting;
-   /// wrap margin
-   CoordType    m_WrapMargin;
    /// Has list changed since last redraw, e.g. in size?
    bool m_Dirty;
    /// Has the list ever been modified?