STL compilation fix

[wxWidgets.git] / include / wx / generic / srchctlg.h

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index d9f42af826b5ab1f77d0ca6858d5802acda4b07b..043ecfa8790a518d56dff770a73959f12e109b92 100644 (file)
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -47,10 +47,12 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxSearchCtrlNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxSearchCtrlNameStr);
 

+#if wxUSE_MENUS

     // get/set search button menu
     // --------------------------
     virtual void SetMenu( wxMenu* menu );
     virtual wxMenu* GetMenu();
     // get/set search button menu
     // --------------------------
     virtual void SetMenu( wxMenu* menu );
     virtual wxMenu* GetMenu();

+#endif // wxUSE_MENUS

 
     // get/set search options
     // ----------------------
 
     // get/set search options
     // ----------------------


@@ -60,11 +62,9 @@ public:
     virtual void ShowCancelButton( bool show );
     virtual bool IsCancelButtonVisible() const;
 
     virtual void ShowCancelButton( bool show );
     virtual bool IsCancelButtonVisible() const;
 

-#if wxABI_VERSION >= 20802

     // TODO: In 2.9 these should probably be virtual, and declared in the base class...
     void SetDescriptiveText(const wxString& text);
     wxString GetDescriptiveText() const;
     // TODO: In 2.9 these should probably be virtual, and declared in the base class...
     void SetDescriptiveText(const wxString& text);
     wxString GetDescriptiveText() const;

-#endif

 
     // accessors
     // ---------
 
     // accessors
     // ---------


@@ -197,8 +197,10 @@ public:
 
     // search control generic only
     void SetSearchBitmap( const wxBitmap& bitmap );
 
     // search control generic only
     void SetSearchBitmap( const wxBitmap& bitmap );

-    void SetSearchMenuBitmap( const wxBitmap& bitmap );

     void SetCancelBitmap( const wxBitmap& bitmap );
     void SetCancelBitmap( const wxBitmap& bitmap );

+#if wxUSE_MENUS
+    void SetSearchMenuBitmap( const wxBitmap& bitmap );
+#endif // wxUSE_MENUS

 
 protected:
     virtual void DoSetValue(const wxString& value, int flags = 0);
 
 protected:
     virtual void DoSetValue(const wxString& value, int flags = 0);


@@ -219,27 +221,46 @@ protected:
 
     void OnSetFocus( wxFocusEvent& event );
     void OnSize( wxSizeEvent& event );
 
     void OnSetFocus( wxFocusEvent& event );
     void OnSize( wxSizeEvent& event );

-    
+
+    bool HasMenu() const
+    {
+#if wxUSE_MENUS
+        return m_menu != NULL;
+#else // !wxUSE_MENUS
+        return false;
+#endif // wxUSE_MENUS/!wxUSE_MENUS
+    }
+

 private:
     friend class wxSearchButton;
 
 private:
     friend class wxSearchButton;
 

+#if wxUSE_MENUS

     void PopupSearchMenu();
     void PopupSearchMenu();

+#endif // wxUSE_MENUS

 
     // the subcontrols
     wxSearchTextCtrl *m_text;
     wxSearchButton *m_searchButton;
     wxSearchButton *m_cancelButton;
 
     // the subcontrols
     wxSearchTextCtrl *m_text;
     wxSearchButton *m_searchButton;
     wxSearchButton *m_cancelButton;

+#if wxUSE_MENUS

     wxMenu *m_menu;
     wxMenu *m_menu;

+#endif // wxUSE_MENUS

 
     bool m_searchButtonVisible;
     bool m_cancelButtonVisible;
 
     bool m_searchBitmapUser;
 
     bool m_searchButtonVisible;
     bool m_cancelButtonVisible;
 
     bool m_searchBitmapUser;

-    bool m_searchMenuBitmapUser;

     bool m_cancelBitmapUser;
     bool m_cancelBitmapUser;

+#if wxUSE_MENUS
+    bool m_searchMenuBitmapUser;
+#endif // wxUSE_MENUS
+

     wxBitmap m_searchBitmap;
     wxBitmap m_searchBitmap;

-    wxBitmap m_searchMenuBitmap;

     wxBitmap m_cancelBitmap;
     wxBitmap m_cancelBitmap;

+#if wxUSE_MENUS
+    wxBitmap m_searchMenuBitmap;
+#endif // wxUSE_MENUS
+

 private:
     DECLARE_DYNAMIC_CLASS(wxSearchCtrl)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxSearchCtrl)