updated to generate ZIP files with DOS line endings

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 88ebbb41afc7271ca604ad3a3c97173795b377c0..f0a19349403538dfc528127afe6c34be12e9a7fa 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -88,6 +88,16 @@ public:
 
     virtual void ShowPosition(long pos);
 
 
     virtual void ShowPosition(long pos);
 

+#ifdef __WXGTK20__
+    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
+    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
+                                            wxTextCoord *col,
+                                            wxTextCoord *row) const
+    {
+        return wxTextCtrlBase::HitTest(pt, col, row);
+    }
+#endif // __WXGTK20__
+

     // Clipboard operations
     virtual void Copy();
     virtual void Cut();
     // Clipboard operations
     virtual void Copy();
     virtual void Cut();


@@ -133,10 +143,16 @@ public:
 
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
 
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

     void CalculateScrollbar();
     void OnInternalIdle();
     void CalculateScrollbar();
     void OnInternalIdle();

+
+#ifdef __WXGTK20__
+    void SetUpdateFont(bool WXUNUSED(update)) { }
+#else // !__WXGTK20__
+    void SetUpdateFont(bool update) { m_updateFont = update; }

     void UpdateFontIfNeeded();
     void UpdateFontIfNeeded();

+#endif // __WXGTK20__/!__WXGTK20__

 
     void SetModified() { m_modified = TRUE; }
 
 
     void SetModified() { m_modified = TRUE; }
 


@@ -162,6 +178,9 @@ public:
     // should we ignore the changed signal? always resets the flag
     bool IgnoreTextUpdate();
 
     // should we ignore the changed signal? always resets the flag
     bool IgnoreTextUpdate();
 

+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 


@@ -175,6 +194,10 @@ protected:
     // scroll position changed
     bool DoScroll(GtkAdjustment *adj, int diff);
 
     // scroll position changed
     bool DoScroll(GtkAdjustment *adj, int diff);
 

+    // Widgets that use the style->base colour for the BG colour should
+    // override this and return true.
+    virtual bool UseGTKStyleBase() const { return true; }
+

 private:
     // change the font for everything in this control
     void ChangeFontGlobally();
 private:
     // change the font for everything in this control
     void ChangeFontGlobally();


@@ -184,7 +207,9 @@ private:
 
     bool        m_modified:1;
     bool        m_vScrollbarVisible:1;
 
     bool        m_modified:1;
     bool        m_vScrollbarVisible:1;

+#ifndef __WXGTK20__

     bool        m_updateFont:1;
     bool        m_updateFont:1;

+#endif // !__WXGTK20__

     bool        m_ignoreNextUpdate:1;
 
     DECLARE_EVENT_TABLE()
     bool        m_ignoreNextUpdate:1;
 
     DECLARE_EVENT_TABLE()