wxWindow::Freeze()/Thaw() can now be nested

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

diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h
index 1d9b21833374107d85e56a8ca746df861840859b..df3a9643392218ae470b4f7c3aeaecc5873ee579 100644 (file)
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -1,25 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textctrl.h
 // Purpose:     wxTextCtrl class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textctrl.h
 // Purpose:     wxTextCtrl class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 
 #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
 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase


@@ -29,16 +28,18 @@ class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 public:
   // creation
   // --------
 public:
   // creation
   // --------

-  wxTextCtrl();
+  wxTextCtrl() { Init(); }

   ~wxTextCtrl();
   ~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,
   }
   
   bool Create(wxWindow *parent, wxWindowID id,


@@ -75,7 +76,8 @@ public:
   // load the controls contents from the file
   virtual bool LoadFile(const wxString& file);
 
   // 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
   virtual void DiscardEdits();
 
   // set the max number of characters which may be entered in a single line


@@ -151,15 +153,23 @@ public:
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 

-       virtual bool MacCanFocus() const { return true ; }
-    
-    virtual void        MacSuperShown( bool show ) ;
-    virtual bool        Show(bool show = TRUE) ;
+       virtual bool MacCanFocus() const { return true ; }
+    virtual bool MacSetupCursor( const wxPoint& pt ) ;
+
+    virtual void      MacSuperShown( bool show ) ;
+    virtual bool     Show(bool show = TRUE) ;

 
 protected:
 
 protected:

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

   virtual wxSize DoGetBestSize() const;
 
   bool  m_editable ;
   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 ;
   // one of the following objects is used for representation, the other one is NULL
   void*  m_macTE ;
   void*  m_macTXN ;