pen.h depends from brush.h in compat mode

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

diff --git a/src/mac/carbon/popupwin.cpp b/src/mac/carbon/popupwin.cpp
index f3f91de49106ac12f8a34b20b54d8d3609ce2195..b60673a5f2732cafd12aa054c5ef0f5962c3258f 100644 (file)
--- a/src/mac/carbon/popupwin.cpp
+++ b/src/mac/carbon/popupwin.cpp
@@ -51,7 +51,7 @@ wxPopupWindow::~wxPopupWindow()
     }
 }
 
     }
 }
 

-bool wxPopupWindow::Create(wxWindow *parent, int flags)
+bool wxPopupWindow::Create(wxWindow *parent, int WXUNUSED(flags))

 {
     m_macIsUserPane = false ;
 
 {
     m_macIsUserPane = false ;
 


@@ -63,13 +63,15 @@ bool wxPopupWindow::Create(wxWindow *parent, int flags)
 
     WindowClass wclass = kHelpWindowClass;
     WindowAttributes attr = kWindowCompositingAttribute ;
 
     WindowClass wclass = kHelpWindowClass;
     WindowAttributes attr = kWindowCompositingAttribute ;

-    WindowRef parentWindow =(WindowRef) parent->MacGetTopLevelWindowRef();

 
     Rect bounds = { 0,0,0,0 };
     OSStatus err = ::CreateNewWindow( wclass , attr , &bounds , (WindowRef*)&m_popupWindowRef ) ;
     if ( err == noErr )
     {
 
     Rect bounds = { 0,0,0,0 };
     OSStatus err = ::CreateNewWindow( wclass , attr , &bounds , (WindowRef*)&m_popupWindowRef ) ;
     if ( err == noErr )
     {

-//        SetWindowGroup( (WindowRef) m_popupWindowRef, GetWindowGroup(parentWindow));    //  Put them in the same group so that their window layers are consistent
+#if 0
+        WindowRef parentWindow =(WindowRef) parent->MacGetTopLevelWindowRef();
+        SetWindowGroup( (WindowRef) m_popupWindowRef, GetWindowGroup(parentWindow));    //  Put them in the same group so that their window layers are consistent
+#endif

 }
 
     m_peer = new wxMacControl(this , true /*isRootControl*/) ;
 }
 
     m_peer = new wxMacControl(this , true /*isRootControl*/) ;


@@ -153,7 +155,7 @@ bool wxPopupWindow::Show(bool show)
         // because apps expect a size event to occur at this moment
         wxSizeEvent event(GetSize() , m_windowId);
         event.SetEventObject(this);
         // because apps expect a size event to occur at this moment
         wxSizeEvent event(GetSize() , m_windowId);
         event.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);

     }
     else
         {
     }
     else
         {