X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..3ef37e7f4ec5f0688a4fb47e530ca2d30a6bb3ed:/include/wx/mac/textctrl.h?ds=sidebyside

diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h
index 4ef850483b..df3a964339 100644
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -6,20 +6,19 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "textctrl.h"
 #endif
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
@@ -29,16 +28,18 @@ class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 public:
   // creation
   // --------
-  wxTextCtrl();
+  wxTextCtrl() { Init(); }
   ~wxTextCtrl();
-  inline wxTextCtrl(wxWindow *parent, wxWindowID id,
-                    const wxString& value = wxEmptyString,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize, long style = 0,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxTextCtrlNameStr)
+  wxTextCtrl(wxWindow *parent, wxWindowID id,
+             const wxString& value = wxEmptyString,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize, long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxTextCtrlNameStr)
   {
-    Create(parent, id, value, pos, size, style, validator, name);
+      Init();
+
+      Create(parent, id, value, pos, size, style, validator, name);
   }
   
   bool Create(wxWindow *parent, wxWindowID id,
@@ -75,7 +76,8 @@ public:
   // load the controls contents from the file
   virtual bool LoadFile(const wxString& file);
 
-  // clears the dirty flag
+  // sets/clears the dirty flag
+  virtual void MarkDirty();
   virtual void DiscardEdits();
 
   // set the max number of characters which may be entered in a single line
@@ -151,16 +153,23 @@ public:
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
-   	virtual bool MacCanFocus() const { return true ; }
+       virtual bool MacCanFocus() const { return true ; }
     virtual bool MacSetupCursor( const wxPoint& pt ) ;
 
-    virtual void 	 MacSuperShown( bool show ) ;
-    virtual bool	 Show(bool show = TRUE) ;
+    virtual void      MacSuperShown( bool show ) ;
+    virtual bool     Show(bool show = TRUE) ;
 
 protected:
+    // common part of all ctors
+    void Init();
+
   virtual wxSize DoGetBestSize() const;
 
   bool  m_editable ;
+
+  // flag is set to true when the user edits the controls contents
+  bool m_dirty;
+
   // one of the following objects is used for representation, the other one is NULL
   void*  m_macTE ;
   void*  m_macTXN ;