Make it easier to not use wxPopupWindow in wxSTC, and for now, don't

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

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 1fc24445ba2974f1916a4b5f0d24f2fcb597e005..8db3f7e902143b929de3273c07e21413c9e0cef5 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -233,7 +233,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     WindowClass wclass = 0;
     WindowAttributes attr = kWindowNoAttributes ;
     
-    if ( HasFlag(wxTINY_CAPTION_HORIZ) ||  HasFlag(wxTINY_CAPTION_VERT) )
+    if ( HasFlag( wxFRAME_TOOL_WINDOW) || HasFlag(wxTINY_CAPTION_HORIZ) ||  HasFlag(wxTINY_CAPTION_VERT) )
     {
         wclass = kFloatingWindowClass ;
         if ( HasFlag(wxTINY_CAPTION_VERT) )
@@ -245,7 +245,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     {
         if ( HasFlag( wxDIALOG_MODAL ) )
         {
-            wclass = kMovableModalWindowClass ;
+            wclass = kDocumentWindowClass ; // kMovableModalWindowClass ;
         }
         else 
         {
@@ -429,6 +429,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
         wxTheApp->s_captureWindow->ScreenToClient( &x , &y ) ;
         event.m_x = x ;
         event.m_y = y ;
+        event.SetEventObject( wxTheApp->s_captureWindow ) ;
         wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
         
         if ( ev->what == mouseUp )