don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h
index 5d60b8e042c884444d82b4cc43903dda3a99c5a2..a0ecffeacfecbb62ce473290c8a7fb62d063d565 100644 (file)
--- a/include/wx/richtext/richtextctrl.h
+++ b/include/wx/richtext/richtextctrl.h
@@ -114,8 +114,6 @@ public:
 
 // Accessors
 
 
 // Accessors
 

-    virtual wxString GetValue() const;
-

     virtual wxString GetRange(long from, long to) const;
 
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetRange(long from, long to) const;
 
     virtual int GetLineLength(long lineNo) const ;


@@ -666,9 +664,6 @@ public:
     virtual bool RecreateBuffer(const wxSize& size = wxDefaultSize);
 #endif
 
     virtual bool RecreateBuffer(const wxSize& size = wxDefaultSize);
 #endif
 

-    /// Set the selection
-    virtual void DoSetSelection(long from, long to, bool scrollCaret = true);
-

     /// Write text
     virtual void DoWriteText(const wxString& value, int flags = 0);
 
     /// Write text
     virtual void DoWriteText(const wxString& value, int flags = 0);
 


@@ -771,21 +766,25 @@ public:
      static const wxArrayString& GetAvailableFontNames();
      static void ClearAvailableFontNames();
 
      static const wxArrayString& GetAvailableFontNames();
      static void ClearAvailableFontNames();
 

+     WX_FORWARD_TO_SCROLL_HELPER()
+
+     // implement wxTextEntry methods
+     virtual wxString DoGetValue() const;
+
+protected:
+     // FIXME: this does not work, it allows this code to compile but will fail
+     //        during run-time

 #ifdef __WXMSW__
     virtual WXHWND GetEditHWND() const { return GetHWND(); }
 #endif
 #ifdef __WXMSW__
     virtual WXHWND GetEditHWND() const { return GetHWND(); }
 #endif

-#ifdef __WXGTK__
-    // implement this to return the associated window, it will be used for
-    // event generation
-    virtual const wxWindow *GetEditableWindow() const { return NULL; }
-
-    // implement this to return the associated GtkEntry or another widget
-    // implementing GtkEditable
+#ifdef __WXMOTIF__
+    virtual WXWidget GetTextWidget() const { return NULL; }
+#endif
+#ifdef __WXGTK20__
+    virtual wxWindow *GetEditableWindow() { return this; }

     virtual GtkEditable *GetEditable() const { return NULL; }
 #endif
 
     virtual GtkEditable *GetEditable() const { return NULL; }
 #endif
 

-     WX_FORWARD_TO_SCROLL_HELPER()
-

 // Overrides
 protected:
 
 // Overrides
 protected: