Rebake from clean wx tree.

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

diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h
index c311083d64efc5765353d4e30b73e663a01dfb68..8d72b3909ca2b8ec04cb8cfcb6cda947d9bc44d8 100644 (file)
--- a/include/wx/richtext/richtextctrl.h
+++ b/include/wx/richtext/richtextctrl.h
@@ -169,13 +169,15 @@ public:
     const wxPoint& GetDragStart() const { return m_dragStart; }
     void SetDragStart(const wxPoint& pt) { m_dragStart = pt; }
 
     const wxPoint& GetDragStart() const { return m_dragStart; }
     void SetDragStart(const wxPoint& pt) { m_dragStart = pt; }
 

+#if wxRICHTEXT_BUFFERED_PAINTING

     /// Get the buffer bitmap
     const wxBitmap& GetBufferBitmap() const { return m_bufferBitmap; }
     wxBitmap& GetBufferBitmap() { return m_bufferBitmap; }
     /// Get the buffer bitmap
     const wxBitmap& GetBufferBitmap() const { return m_bufferBitmap; }
     wxBitmap& GetBufferBitmap() { return m_bufferBitmap; }

+#endif

 
     /// Get/set context menu
     wxMenu* GetContextMenu() const { return m_contextMenu; }
 
     /// Get/set context menu
     wxMenu* GetContextMenu() const { return m_contextMenu; }

-    void SetContextMenu(wxMenu* menu) { m_contextMenu = menu; }
+    void SetContextMenu(wxMenu* menu);

 
     /// Anchor so we know how to extend the selection
     /// It's a caret position since it's between two characters.
 
     /// Anchor so we know how to extend the selection
     /// It's a caret position since it's between two characters.