cleaning up problems after string changes

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 5e34888f444aae84ffbeebda37a8d884e5633ed2..5abad1b57b692c125d95c7d205d0f1e4fb90f7d2 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -1,25 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/textctrl.h
+// Name:        wx/gtk1/textctrl.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "textctrl.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // wxTextCtrl
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxTextCtrl
 //-----------------------------------------------------------------------------
 

-class wxTextCtrl: public wxTextCtrlBase
+class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase

 {
 public:
     wxTextCtrl() { Init(); }
 {
 public:
     wxTextCtrl() { Init(); }


@@ -32,6 +28,8 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 

+    virtual ~wxTextCtrl();
+

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString &value = wxEmptyString,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString &value = wxEmptyString,


@@ -45,7 +43,6 @@ public:
     // ----------------------------------
 
     virtual wxString GetValue() const;
     // ----------------------------------
 
     virtual wxString GetValue() const;

-    virtual void SetValue(const wxString& value);

 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;


@@ -104,12 +101,12 @@ public:
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;

-    virtual long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;

 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 

-    virtual bool Enable( bool enable = TRUE );
+    virtual void DoEnable( bool enable );

 
     // Implementation from now on
     void OnDropFiles( wxDropFilesEvent &event );
 
     // Implementation from now on
     void OnDropFiles( wxDropFilesEvent &event );


@@ -133,12 +130,14 @@ 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();

+
+    void SetUpdateFont(bool update) { m_updateFont = update; }

     void UpdateFontIfNeeded();
 
     void UpdateFontIfNeeded();
 

-    void SetModified() { m_modified = TRUE; }
+    void SetModified() { m_modified = true; }

 
     // GTK+ textctrl is so dumb that you need to freeze/thaw it manually to
     // avoid horrible flicker/scrolling back and forth
 
     // GTK+ textctrl is so dumb that you need to freeze/thaw it manually to
     // avoid horrible flicker/scrolling back and forth


@@ -154,7 +153,7 @@ public:
     // wxGTK-specific: called recursively by Enable,
     // to give widgets an oppprtunity to correct their colours after they
     // have been changed by Enable
     // wxGTK-specific: called recursively by Enable,
     // to give widgets an oppprtunity to correct their colours after they
     // have been changed by Enable

-    virtual void OnParentEnable( bool enable ) ;
+    virtual void OnEnabled( bool enabled ) ;

 
     // tell the control to ignore next text changed signal
     void IgnoreNextTextUpdate();
 
     // tell the control to ignore next text changed signal
     void IgnoreNextTextUpdate();


@@ -164,7 +163,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

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


@@ -182,6 +181,8 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 

+    virtual void DoSetValue(const wxString &value, int flags = 0);
+

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


@@ -195,7 +196,7 @@ private:
     bool        m_ignoreNextUpdate:1;
 
     DECLARE_EVENT_TABLE()
     bool        m_ignoreNextUpdate:1;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxTextCtrl);
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)

 };
 
 #endif // __GTKTEXTCTRLH__
 };
 
 #endif // __GTKTEXTCTRLH__