Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 19d716fcab6ed241425754fa539eb4d0c9eb44c9..5db8cb09e77e4fd1a0b21e1292aeec4f9de3e037 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -63,6 +63,7 @@ public:
     virtual void DiscardEdits();
 
     virtual bool SetStyle(long start, long end, const wxTextAttr& style);
     virtual void DiscardEdits();
 
     virtual bool SetStyle(long start, long end, const wxTextAttr& style);

+    virtual bool GetStyle(long position, wxTextAttr& style);

 
     // translate between the position (which is just an index in the text ctrl
     // considering all its contents as a single strings) and (x, y) coordinates
 
     // translate between the position (which is just an index in the text ctrl
     // considering all its contents as a single strings) and (x, y) coordinates


@@ -144,28 +145,28 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:

-    // wxGTK-specific: called recursively by Enable,
-    // to give widgets an oppprtunity to correct their colours after they
-    // have been changed by Enable
-    virtual void OnEnabled(bool enable);
-

     // overridden wxWindow virtual methods
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     // overridden wxWindow virtual methods
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 

+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+

     virtual void DoFreeze();
     virtual void DoThaw();
 
     virtual void DoFreeze();
     virtual void DoThaw();
 

-    // common part of all ctors
-    void Init();
-

     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 

+    // Override this to use either GtkEntry or GtkTextView IME depending on the
+    // kind of control we are.
+    virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
+
+    virtual wxPoint DoPositionToCoords(long pos) const;
+

     // wrappers hiding the differences between functions doing the same thing
     // for GtkTextView and GtkEntry (all of them use current window style to
     // set the given characteristic)
     // wrappers hiding the differences between functions doing the same thing
     // for GtkTextView and GtkEntry (all of them use current window style to
     // set the given characteristic)


@@ -176,9 +177,11 @@ protected:
     void GTKSetJustification();
 
 private:
     void GTKSetJustification();
 
 private:

+    void Init();
+

     // overridden wxTextEntry virtual methods
     // overridden wxTextEntry virtual methods

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

     virtual GtkEditable *GetEditable() const;
     virtual GtkEditable *GetEditable() const;

+    virtual GtkEntry *GetEntry() const;

     virtual void EnableTextChangedEvents(bool enable);
 
     // change the font for everything in this control
     virtual void EnableTextChangedEvents(bool enable);
 
     // change the font for everything in this control


@@ -195,8 +198,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);

     }
 
 
     }
 
 


@@ -213,11 +216,10 @@ private:
     GtkTextBuffer *m_buffer;
 
     GtkTextMark* m_showPositionOnThaw;
     GtkTextBuffer *m_buffer;
 
     GtkTextMark* m_showPositionOnThaw;

+    GSList* m_anonymousMarkList;

 
     // For wxTE_AUTO_URL
     void OnUrlMouseEvent(wxMouseEvent&);
 
     // For wxTE_AUTO_URL
     void OnUrlMouseEvent(wxMouseEvent&);

-    GdkCursor *m_gdkHandCursor;
-    GdkCursor *m_gdkXTermCursor;

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)