Allow returning NULL windows from GetCompositeWindowParts().

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index a4371c7c98f5dca3e056eb0282b4c9e99852b581..336a5cfa2e44116a474da8afc2fa1ad5a8b809c5 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


@@ -166,6 +167,8 @@ protected:
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 

+    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)


@@ -178,6 +181,7 @@ protected:
 private:
     // overridden wxTextEntry virtual methods
     virtual GtkEditable *GetEditable() const;
 private:
     // overridden wxTextEntry virtual methods
     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


@@ -212,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)