test for special keys first, before testing for alphanumeric ones as even keys such...

[wxWidgets.git] / wxPython / src / _srchctrl.i

diff --git a/wxPython/src/_srchctrl.i b/wxPython/src/_srchctrl.i
index 39871ab4d60a1399828fe436f9f5df7a15cb73db..894b8a49a6352f836e659e9cc5573ff3bd4f24df 100644 (file)
--- a/wxPython/src/_srchctrl.i
+++ b/wxPython/src/_srchctrl.i
@@ -58,6 +58,9 @@ public:
 
     virtual void ShowCancelButton( bool ) {}
     virtual bool IsCancelButtonVisible() const { return false; }
 
     virtual void ShowCancelButton( bool ) {}
     virtual bool IsCancelButtonVisible() const { return false; }

+
+    virtual void SetDescriptiveText(const wxString& text);
+    virtual wxString GetDescriptiveText() const;

 };    
 #endif
 %}
 };    
 #endif
 %}


@@ -71,7 +74,7 @@ DocStr(wxSearchCtrl,
 "A search control is a composite of a `wx.TextCtrl` with optional
 bitmap buttons and a drop-down menu.  Controls like this can typically
 be found on a toolbar of applications that support some form of search
 "A search control is a composite of a `wx.TextCtrl` with optional
 bitmap buttons and a drop-down menu.  Controls like this can typically
 be found on a toolbar of applications that support some form of search

-functionality.  On the Mac this control is implemneted using the
+functionality.  On the Mac this control is implemented using the

 native HISearchField control, on the other platforms a generic control
 is used, although that may change in the future as more platforms
 introduce native search widgets.
 native HISearchField control, on the other platforms a generic control
 is used, although that may change in the future as more platforms
 introduce native search widgets.


@@ -167,6 +170,17 @@ button visibility value.  This always returns false in Mac OS X v10.3", "");
         "Indicates whether the cancel button is visible. ", "");
     
 
         "Indicates whether the cancel button is visible. ", "");
     
 

+    DocDeclStr(
+        virtual void , SetDescriptiveText(const wxString& text),
+        "Set the text to be displayed when the user has not yet typed anything
+in the control.", "");
+    
+    DocDeclStr(
+        virtual wxString , GetDescriptiveText() const,
+        "Get the text to be displayed when the user has not yet typed anything
+in the control.", "");
+    
+    

     DocStr(SetSearchBitmap,
            "Sets the bitmap to use for the search button.  This currently does not
 work on the Mac.", "");
     DocStr(SetSearchBitmap,
            "Sets the bitmap to use for the search button.  This currently does not
 work on the Mac.", "");


@@ -177,6 +191,7 @@ on the Mac.", "");
     DocStr(SetCancelBitmap,
            "Sets the bitmap to use for the cancel button.  This currently does not
 work on the Mac.", "");
     DocStr(SetCancelBitmap,
            "Sets the bitmap to use for the cancel button.  This currently does not
 work on the Mac.", "");

+

     
 #ifdef __WXMAC__
     %extend {
     
 #ifdef __WXMAC__
     %extend {


@@ -194,6 +209,7 @@ work on the Mac.", "");
     %property(Menu, GetMenu, SetMenu);
     %property(SearchButtonVisible, IsSearchButtonVisible, ShowSearchButton);
     %property(CancelButtonVisible, IsCancelButtonVisible, ShowCancelButton);
     %property(Menu, GetMenu, SetMenu);
     %property(SearchButtonVisible, IsSearchButtonVisible, ShowSearchButton);
     %property(CancelButtonVisible, IsCancelButtonVisible, ShowCancelButton);

+    %property(DescriptiveText, GetDescriptiveText, SetDescriptiveText);

 };
      
 
 };