Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

[wxWidgets.git] / include / wx / textentry.h

diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index c0c116a433489754a2cbee5e0a6cdb2e6c8be594..130446a4a316071a6b06fe17ed5d00eba0ab0982 100644 (file)
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -17,6 +17,9 @@ typedef long wxTextPos;
 
 class WXDLLIMPEXP_FWD_BASE wxArrayString;
 class WXDLLIMPEXP_FWD_CORE wxTextEntryHintData;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+
+#include "wx/gdicmn.h"              // for wxPoint
 
 // ----------------------------------------------------------------------------
 // wxTextEntryBase
@@ -141,6 +144,20 @@ public:
     virtual wxString GetHint() const;
 
 
+    // margins
+    // -------
+
+    // margins are the empty space between borders of control and the text
+    // itself. When setting margin, use value -1 to indicate that specific
+    // margin should not be changed.
+
+    bool SetMargins(const wxPoint& pt)
+        { return DoSetMargins(pt); }
+    bool SetMargins(wxCoord left, wxCoord top = -1)
+        { return DoSetMargins(wxPoint(left, top)); }
+    wxPoint GetMargins() const
+        { return DoGetMargins(); }
+
 protected:
     // flags for DoSetValue(): common part of SetValue() and ChangeValue() and
     // also used to implement WriteText() in wxMSW
@@ -154,6 +171,15 @@ protected:
     virtual void DoSetValue(const wxString& value, int flags);
     virtual wxString DoGetValue() const = 0;
 
+    // override this to return the associated window, it will be used for event
+    // generation and also by generic hints implementation
+    virtual wxWindow *GetEditableWindow() = 0;
+
+    // margins functions
+    virtual bool DoSetMargins(const wxPoint& pt);
+    virtual wxPoint DoGetMargins() const;
+
+
     // class which should be used to temporarily disable text change events
     //
     // if suppress argument in ctor is false, nothing is done
@@ -185,11 +211,6 @@ protected:
     bool EventsAllowed() const { return m_eventsBlock == 0; }
 
 private:
-    // override this to return the associated window, it will be used for event
-    // generation and also by generic hints implementation
-    virtual wxWindow *GetEditableWindow() = 0;
-
-
     // suppress or resume the text changed events generation: don't use these
     // functions directly, use EventsSuppressor class above instead
     void SuppressTextChangedEvents()