Forbid setting hints for multi-line text controls.

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 45ae16eea5f14d82a34857836131da3205da71ae..c131fbb9ce71d73ac01ff9e6f3163264013bf597 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -130,12 +130,7 @@ wxDEPRECATED_INLINE(inline bool wxStringEq(const wchar_t *s1, const wchar_t *s2)
 // ----------------------------------------------------------------------------
 
 // Sound the bell
 // ----------------------------------------------------------------------------
 
 // Sound the bell

-#if !defined __EMX__ && \
-    (defined __WXMOTIF__ || defined __WXGTK__ || defined __WXX11__)

 WXDLLIMPEXP_CORE void wxBell();
 WXDLLIMPEXP_CORE void wxBell();

-#else
-WXDLLIMPEXP_BASE void wxBell();
-#endif

 
 #if wxUSE_MSGDLG
 // Show wxWidgets information
 
 #if wxUSE_MSGDLG
 // Show wxWidgets information


@@ -410,12 +405,12 @@ WXDLLIMPEXP_BASE long wxExecute(const wxString& command,
                                 int flags = 0,
                                 const wxExecuteEnv *env = NULL);
 
                                 int flags = 0,
                                 const wxExecuteEnv *env = NULL);
 

-#if defined(__WXMSW__) && wxUSE_IPC
+#if defined(__WINDOWS__) && wxUSE_IPC

 // ask a DDE server to execute the DDE request with given parameters
 WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer,
                                    const wxString& ddeTopic,
                                    const wxString& ddeCommand);
 // ask a DDE server to execute the DDE request with given parameters
 WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer,
                                    const wxString& ddeTopic,
                                    const wxString& ddeCommand);

-#endif // __WXMSW__ && wxUSE_IPC
+#endif // __WINDOWS__ && wxUSE_IPC

 
 enum wxSignal
 {
 
 enum wxSignal
 {


@@ -815,8 +810,8 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded();
 // Windows resources access
 // ----------------------------------------------------------------------------
 
 // Windows resources access
 // ----------------------------------------------------------------------------
 

-// MSW only: get user-defined resource from the .res file.
-#ifdef __WXMSW__
+// Windows only: get user-defined resource from the .res file.
+#ifdef __WINDOWS__

     // default resource type for wxLoadUserResource()
     extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxUserResourceStr;
 
     // default resource type for wxLoadUserResource()
     extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxUserResourceStr;
 


@@ -843,7 +838,7 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded();
                        const wxString& resourceType = wxUserResourceStr,
                        int* pLen = NULL,
                        WXHINSTANCE module = 0);
                        const wxString& resourceType = wxUserResourceStr,
                        int* pLen = NULL,
                        WXHINSTANCE module = 0);

-#endif // MSW
+#endif // __WINDOWS__

 
 #endif
     // _WX_UTILSH__
 
 #endif
     // _WX_UTILSH__