Fix for VA 4.0

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

diff --git a/samples/richedit/wxlwindow.h b/samples/richedit/wxlwindow.h
index 5453903a235d8fc1e53d102bb1996a9fa83f8a3f..fa0ba4b2911404e63aabe7969503a9b327a9cbf0 100644 (file)
--- a/samples/richedit/wxlwindow.h
+++ b/samples/richedit/wxlwindow.h
@@ -23,8 +23,6 @@
 #endif
 
 
 #endif
 
 

-#define wxUSE_PRIVATE_CLIPBOARD_FORMAT 0
-

 enum
 {
    WXLOWIN_MENU_LARGER = WXLOWIN_MENU_FIRST,
 enum
 {
    WXLOWIN_MENU_LARGER = WXLOWIN_MENU_FIRST,


@@ -97,24 +95,21 @@ 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);

    //@}
 
    //@}
 

-#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);
    /// 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; }
 
 
    void EnablePopup(bool enable = true) { m_DoPopupMenu = enable; }