don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / gtk / textctrl.h

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 19d716fcab6ed241425754fa539eb4d0c9eb44c9..a4371c7c98f5dca3e056eb0282b4c9e99852b581 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -177,7 +177,6 @@ protected:
 
 private:
     // overridden wxTextEntry virtual methods
 
 private:
     // overridden wxTextEntry virtual methods

-    virtual const wxWindow *GetEditableWindow() const { return this; }

     virtual GtkEditable *GetEditable() const;
     virtual void EnableTextChangedEvents(bool enable);
 
     virtual GtkEditable *GetEditable() const;
     virtual void EnableTextChangedEvents(bool enable);
 


@@ -195,8 +194,8 @@ private:
     // both
     void *GetTextObject() const
     {
     // both
     void *GetTextObject() const
     {

-        return IsMultiLine() ? wx_static_cast(void *, m_buffer)
-                             : wx_static_cast(void *, m_text);
+        return IsMultiLine() ? static_cast<void *>(m_buffer)
+                             : static_cast<void *>(m_text);

     }
 
 
     }