fixing support for true children of wxStaticBox with wxStaticBoxSizer under osx_cocoa

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

diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index 640d82cf1c76933b29bab69b7301b96b787e4414..3fadbd0322e93e4050310e5bb3c94aba7d1cb9d2 100644 (file)
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -38,8 +38,7 @@ public:
     // SetValue() generates a text change event, ChangeValue() doesn't
     virtual void SetValue(const wxString& value)
         { DoSetValue(value, SetValue_SendEvent); }
     // SetValue() generates a text change event, ChangeValue() doesn't
     virtual void SetValue(const wxString& value)
         { DoSetValue(value, SetValue_SendEvent); }

-    virtual void ChangeValue(const wxString& value)
-        { DoSetValue(value, SetValue_NoEvent); }
+    virtual void ChangeValue(const wxString& value);

 
     // writing text inserts it at the current position replacing any current
     // selection, appending always inserts it at the end and doesn't remove any
 
     // writing text inserts it at the current position replacing any current
     // selection, appending always inserts it at the end and doesn't remove any


@@ -168,6 +167,21 @@ public:
     // NB: this is public for wxRichTextCtrl use only right now, do not call it
     static bool SendTextUpdatedEvent(wxWindow *win);
 
     // NB: this is public for wxRichTextCtrl use only right now, do not call it
     static bool SendTextUpdatedEvent(wxWindow *win);
 

+    // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window
+    bool SendTextUpdatedEvent()
+    {
+        return SendTextUpdatedEvent(GetEditableWindow());
+    }
+
+
+    // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window if the
+    // events are not currently disabled
+    void SendTextUpdatedEventIfAllowed()
+    {
+        if ( EventsAllowed() )
+            SendTextUpdatedEvent();
+    }
+

     // this function is provided solely for the purpose of forwarding text
     // change notifications state from one control to another, e.g. it can be
     // used by a wxComboBox which derives from wxTextEntry if it delegates all
     // this function is provided solely for the purpose of forwarding text
     // change notifications state from one control to another, e.g. it can be
     // used by a wxComboBox which derives from wxTextEntry if it delegates all


@@ -232,21 +246,6 @@ protected:
 
     friend class EventsSuppressor;
 
 
     friend class EventsSuppressor;
 

-    // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window
-    bool SendTextUpdatedEvent()
-    {
-        return SendTextUpdatedEvent(GetEditableWindow());
-    }
-
-    // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window if the
-    // events are not currently disabled
-    void SendTextUpdatedEventIfAllowed()
-    {
-        if ( EventsAllowed() )
-            SendTextUpdatedEvent();
-    }
-
-

 private:
     // suppress or resume the text changed events generation: don't use these
     // functions directly, use EventsSuppressor class above instead
 private:
     // suppress or resume the text changed events generation: don't use these
     // functions directly, use EventsSuppressor class above instead


@@ -279,6 +278,10 @@ private:
 
     // hint-related stuff, only allocated if/when SetHint() is used
     wxTextEntryHintData *m_hintData;
 
     // hint-related stuff, only allocated if/when SetHint() is used
     wxTextEntryHintData *m_hintData;

+
+    // It needs to call our Do{Get,Set}Value() to work with the real control
+    // contents.
+    friend class wxTextEntryHintData;

 };
 
 #ifdef __WXUNIVERSAL__
 };
 
 #ifdef __WXUNIVERSAL__