Start/EndDrawingOnTop are still used under Motif, don't deprecate them

[wxWidgets.git] / include / wx / richtext / richtextctrl.h

diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h
index 4f61ba36d2f3b82f6b2b281b6aa811271f78fa20..a0f5aefdf42e0acc6d54552f3d14f2cea5656e64 100644 (file)
--- a/include/wx/richtext/richtextctrl.h
+++ b/include/wx/richtext/richtextctrl.h
@@ -12,21 +12,23 @@
 #ifndef _WX_RICHTEXTCTRL_H_
 #define _WX_RICHTEXTCTRL_H_
 
 #ifndef _WX_RICHTEXTCTRL_H_
 #define _WX_RICHTEXTCTRL_H_
 

-#include "wx/textctrl.h"
+#include "wx/richtext/richtextbuffer.h"

 
 #if wxUSE_RICHTEXT
 
 #include "wx/scrolwin.h"
 #include "wx/caret.h"
 
 
 #if wxUSE_RICHTEXT
 
 #include "wx/scrolwin.h"
 #include "wx/caret.h"
 

-#include "wx/richtext/richtextbuffer.h"
-

 #if wxCHECK_VERSION(2,7,0)
 #define wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE 0
 #else
 #define wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE 0
 #endif
 
 #if wxCHECK_VERSION(2,7,0)
 #define wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE 0
 #else
 #define wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE 0
 #endif
 

+#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
+#include "wx/textctrl.h"
+#endif
+

 /*!
  * Styles and flags
  */
 /*!
  * Styles and flags
  */


@@ -231,7 +233,7 @@ public:
     virtual void Freeze();
 
     /// Call Thaw to refresh
     virtual void Freeze();
 
     /// Call Thaw to refresh

-    virtual void Thaw(bool refresh = true);
+    virtual void Thaw();

 
     /// Call Thaw to refresh
     virtual bool IsFrozen() const { return m_freezeCount > 0; }
 
     /// Call Thaw to refresh
     virtual bool IsFrozen() const { return m_freezeCount > 0; }


@@ -383,7 +385,7 @@ public:
 
     /// Layout the buffer: which we must do before certain operations, such as
     /// setting the caret position.
 
     /// Layout the buffer: which we must do before certain operations, such as
     /// setting the caret position.

-    virtual bool Layout(bool onlyVisibleRect = false);
+    virtual bool LayoutContent(bool onlyVisibleRect = false);

 
     /// Move the caret to the given character position
     virtual bool MoveCaret(long pos, bool showAtLineStart = false);
 
     /// Move the caret to the given character position
     virtual bool MoveCaret(long pos, bool showAtLineStart = false);


@@ -573,6 +575,10 @@ public:
 
 // Implementation
 
 
 // Implementation
 

+#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
+     WX_FORWARD_TO_SCROLL_HELPER()
+#endif
+

     /// Set font, and also default attributes
     virtual bool SetFont(const wxFont& font);
 
     /// Set font, and also default attributes
     virtual bool SetFont(const wxFont& font);
 


@@ -580,7 +586,7 @@ public:
     virtual void SetupScrollbars(bool atTop = false);
 
     /// Keyboard navigation
     virtual void SetupScrollbars(bool atTop = false);
 
     /// Keyboard navigation

-    virtual bool Navigate(int keyCode, int flags);
+    virtual bool KeyboardNavigate(int keyCode, int flags);

 
     /// Paint the background
     virtual void PaintBackground(wxDC& dc);
 
     /// Paint the background
     virtual void PaintBackground(wxDC& dc);