added wxTextCtrl::HitTest(); implemented it for MSW

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 4e1a581f47d85975f8256c981d446961595e9ba8..ff1ae8a51f113dd70bd21273f5f26c5d694fd946 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -123,10 +123,10 @@ enum
     #else // wxUSE_TOOLBAR_NATIVE
         #if defined(__WXUNIVERSAL__)
            #include "wx/univ/toolbar.h"
     #else // wxUSE_TOOLBAR_NATIVE
         #if defined(__WXUNIVERSAL__)
            #include "wx/univ/toolbar.h"

+        #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI))
+           #include "wx/msw/tbar95.h"

         #elif defined(__WXWINCE__)
            #include "wx/msw/wince/tbarwce.h"
         #elif defined(__WXWINCE__)
            #include "wx/msw/wince/tbarwce.h"

-        #elif defined(__WXMSW__) && defined(__WIN95__)
-           #include "wx/msw/tbar95.h"

         #elif defined(__WXMSW__)
            #include "wx/msw/tbarmsw.h"
         #elif defined(__WXMOTIF__)
         #elif defined(__WXMSW__)
            #include "wx/msw/tbarmsw.h"
         #elif defined(__WXMOTIF__)


@@ -135,6 +135,8 @@ enum
            #include "wx/gtk/tbargtk.h"
         #elif defined(__WXMAC__)
            #include "wx/mac/toolbar.h"
            #include "wx/gtk/tbargtk.h"
         #elif defined(__WXMAC__)
            #include "wx/mac/toolbar.h"

+        #elif defined(__WXCOCOA__)
+           #include "wx/cocoa/toolbar.h"

         #elif defined(__WXPM__)
            #include "wx/os2/toolbar.h"
         #endif
         #elif defined(__WXPM__)
            #include "wx/os2/toolbar.h"
         #endif