wxMGL compilation fixes

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

diff --git a/samples/richedit/wxlwindow.h b/samples/richedit/wxlwindow.h
index 4ad20e8fce12d9e711ce27f7589e65adf388fcde..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++ -*-********************************************************
  * 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$
  *******************************************************************/
  *                                                                  *
  * $Id$
  *******************************************************************/


@@ -95,13 +95,13 @@ public:
       m_CursorVisibility = visibility; return v;}
 
    /// Pastes text from clipboard.
       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
    */
    /** 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.
    /// Copies selection to clipboard and deletes it.

-   bool Cut(void);
+   bool Cut(bool privateFormat = FALSE, bool usePrimary = FALSE);

    //@}
 
    /// find string in buffer
    //@}
 
    /// find string in buffer


@@ -118,6 +118,11 @@ public:
    */
    void SetWrapMargin(CoordType margin) { m_WrapMargin = margin; }
 
    */
    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.
    /** Redraws the window.
        Internally, this stores the parameter and calls a refresh on
        wxMSW, draws directly on wxGTK.


@@ -230,6 +235,10 @@ protected:
    int m_maxx;
    int m_maxy;
    int m_lineHeight;
    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,
 
    /// do we have the corresponding scrollbar?
    bool m_hasHScrollbar,


@@ -253,8 +262,6 @@ private:
    bool m_Editable;
    /// Are we currently building a selection with the keyboard?
    bool m_Selecting;
    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?
    /// Has list changed since last redraw, e.g. in size?
    bool m_Dirty;
    /// Has the list ever been modified?