Include missing.h to find O_* flags.

[wxWidgets.git] / src / mac / carbon / toplevel.cpp

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 18b9a9b984f93bb7e89a35835bd0e2a8b6a16c45..d41ae760f042f007907aef794a75fc58b2647a84 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -49,6 +49,9 @@
 
 #include <ToolUtils.h>
 
 
 #include <ToolUtils.h>
 

+//For targeting OSX
+#include "wx/mac/private.h"
+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -444,7 +447,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
             else
             {
                 currentMouseWindow = wxFindControlFromMacControl( control ) ;
             else
             {
                 currentMouseWindow = wxFindControlFromMacControl( control ) ;

-                if ( currentMouseWindow == NULL )
+                if ( currentMouseWindow == NULL && cEvent.GetKind() == kEventMouseMoved )

                 {
                        // for wxToolBar to function we have to send certaint events to it
                        // instead of its children (wxToolBarTools)     
                 {
                        // for wxToolBar to function we have to send certaint events to it
                        // instead of its children (wxToolBarTools)     


@@ -983,6 +986,16 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     {
         wclass = kDocumentWindowClass ;
     }
     {
         wclass = kDocumentWindowClass ;
     }

+#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+    else if ( HasFlag( wxFRAME_DRAWER ) )
+    {
+        wclass = kDrawerWindowClass;
+        // Should this be left for compositing check below?
+        // CreateNewWindow will fail without it, should wxDrawerWindow turn
+        // on compositing before calling MacCreateRealWindow?
+        attr |= kWindowCompositingAttribute;// | kWindowStandardHandlerAttribute;
+    }
+#endif  //10.2 and up

     else
     {
         if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
     else
     {
         if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||