implemented menu drawing in the GTK theme

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

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 14afc2d9599c804d9597e5e4be190e74f159bb72..f290f8167fdcdc5731c6debef4e1aac82bfb2432 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -40,6 +40,12 @@
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 #include "wx/tooltip.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 #include "wx/tooltip.h"

+#include "wx/dnd.h"
+
+#define wxMAC_DEBUG_REDRAW 0
+#ifndef wxMAC_DEBUG_REDRAW
+#define wxMAC_DEBUG_REDRAW 0
+#endif

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


@@ -59,7 +65,7 @@ wxWindowList wxModelessWindows;
 // Find an item given the Macintosh Window Reference
 
 wxList *wxWinMacWindowList = NULL;
 // Find an item given the Macintosh Window Reference
 
 wxList *wxWinMacWindowList = NULL;

-wxTopLevelWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
+wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef)

 {
     wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
     if (!node)
 {
     wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
     if (!node)


@@ -67,7 +73,7 @@ wxTopLevelWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
     return (wxTopLevelWindowMac *)node->Data();
 }
 
     return (wxTopLevelWindowMac *)node->Data();
 }
 

-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxTopLevelWindowMac *win)
+void wxAssociateWinWithMacWindow(WXWindow inWindowRef, wxTopLevelWindowMac *win)

 {
     // adding NULL WindowRef is (first) surely a result of an error and
     // (secondly) breaks menu command processing
 {
     // adding NULL WindowRef is (first) surely a result of an error and
     // (secondly) breaks menu command processing


@@ -87,7 +93,7 @@ void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
 // wxTopLevelWindowMac creation
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowMac creation
 // ----------------------------------------------------------------------------
 

-WindowRef wxTopLevelWindowMac::s_macWindowInUpdate = NULL;
+WXHWND wxTopLevelWindowMac::s_macWindowInUpdate = NULL;

 
 void wxTopLevelWindowMac::Init()
 {
 
 void wxTopLevelWindowMac::Init()
 {


@@ -95,6 +101,7 @@ void wxTopLevelWindowMac::Init()
     m_maximizeOnShow = FALSE;
     m_macNoEraseUpdateRgn = NewRgn() ;
     m_macNeedsErasing = false ;
     m_maximizeOnShow = FALSE;
     m_macNoEraseUpdateRgn = NewRgn() ;
     m_macNeedsErasing = false ;

+    m_macWindow = NULL ;

 }
 
 bool wxTopLevelWindowMac::Create(wxWindow *parent,
 }
 
 bool wxTopLevelWindowMac::Create(wxWindow *parent,


@@ -124,9 +131,12 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent,
 
 wxTopLevelWindowMac::~wxTopLevelWindowMac()
 {
 
 wxTopLevelWindowMac::~wxTopLevelWindowMac()
 {

-    wxToolTip::NotifyWindowDelete(m_macWindow) ;
-    UMADisposeWindow( m_macWindow ) ;
-
+    if ( m_macWindow )
+    {
+        wxToolTip::NotifyWindowDelete(m_macWindow) ;
+        UMADisposeWindow( (WindowRef) m_macWindow ) ;
+    }
+    

     wxRemoveMacWindowAssociation( this ) ;
 
     wxTopLevelWindows.DeleteObject(this);
     wxRemoveMacWindowAssociation( this ) ;
 
     wxTopLevelWindows.DeleteObject(this);


@@ -144,7 +154,7 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
           wxTheApp->ExitMainLoop() ;        
         }
     }
           wxTheApp->ExitMainLoop() ;        
         }
     }

-    DisposeRgn( m_macNoEraseUpdateRgn ) ;
+    DisposeRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;

 }
 
 
 }
 
 


@@ -169,7 +179,7 @@ void wxTopLevelWindowMac::Iconize(bool iconize)
 
 bool wxTopLevelWindowMac::IsIconized() const
 {
 
 bool wxTopLevelWindowMac::IsIconized() const
 {

-       // mac dialogs cannot be iconized
+    // mac dialogs cannot be iconized

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -223,7 +233,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     WindowClass wclass = 0;
     WindowAttributes attr = kWindowNoAttributes ;
     
     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) )
     {
         wclass = kFloatingWindowClass ;
         if ( HasFlag(wxTINY_CAPTION_VERT) )


@@ -261,55 +271,37 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
         attr |= kWindowCloseBoxAttribute ;
     }
     
         attr |= kWindowCloseBoxAttribute ;
     }
     

-    ::CreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindow ) ;
+    ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;

     wxAssociateWinWithMacWindow( m_macWindow , this ) ;
     wxString label ;
     if( wxApp::s_macDefaultEncodingIsPC )
         label = wxMacMakeMacStringFromPC( title ) ;
     else
         label = title ;
     wxAssociateWinWithMacWindow( m_macWindow , this ) ;
     wxString label ;
     if( wxApp::s_macDefaultEncodingIsPC )
         label = wxMacMakeMacStringFromPC( title ) ;
     else
         label = title ;

-    UMASetWTitleC( m_macWindow , label ) ;
-    ::CreateRootControl( m_macWindow , &m_macRootControl ) ;
+    UMASetWTitleC( (WindowRef)m_macWindow , label ) ;
+    ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ;

 
     m_macFocus = NULL ;
 }
 
 
     m_macFocus = NULL ;
 }
 

-void wxTopLevelWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) 
-{
-    localOrigin->h = 0;
-    localOrigin->v = 0;
-    clipRect->left = 0;
-    clipRect->top = 0;
-    clipRect->right = m_width ;//width;
-    clipRect->bottom = m_height ;// height;
-    *window = m_macWindow ;
-    *rootwin = this ;
-}
-
-void wxTopLevelWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) 
+void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window  , wxWindowMac** rootwin) 

 {
 {

-    localOrigin->h = 0;
-    localOrigin->v = 0;
-    clipRect->left = 0;
-    clipRect->top = 0;
-    clipRect->right = m_width;
-    clipRect->bottom = m_height;
+    ((Point*)localOrigin)->h = 0;
+    ((Point*)localOrigin)->v = 0;
+    ((Rect*)clipRect)->left = 0;
+    ((Rect*)clipRect)->top = 0;
+    ((Rect*)clipRect)->right = m_width;
+    ((Rect*)clipRect)->bottom = m_height;

     *window = m_macWindow ;
     *rootwin = this ;
 }
 
 void wxTopLevelWindowMac::Clear()
 {
     *window = m_macWindow ;
     *rootwin = this ;
 }
 
 void wxTopLevelWindowMac::Clear()
 {

-    wxMacDrawingClientHelper helper ( this ) ;
-    int w ,h ;
-    wxPoint origin = GetClientAreaOrigin() ;
-    GetClientSize( &w , &h ) ;
-    ::SetThemeWindowBackground( m_macWindow , m_macWindowBackgroundTheme , false ) ;
-    Rect r = { origin.y , origin.x, origin.y+h , origin.x+w } ;
-    EraseRect( &r ) ;
+  wxWindow::Clear() ;

 }
 
 }
 

-ControlHandle wxTopLevelWindowMac::MacGetContainerForEmbedding() 
+WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() 

 {
     return m_macRootControl ;
 }
 {
     return m_macRootControl ;
 }


@@ -317,20 +309,17 @@ ControlHandle wxTopLevelWindowMac::MacGetContainerForEmbedding()
 
 void wxTopLevelWindowMac::MacUpdate( long timestamp)
 {
 
 void wxTopLevelWindowMac::MacUpdate( long timestamp)
 {

-    #if TARGET_CARBON
-    AGAPortHelper help( GetWindowPort(m_macWindow) ) ;
-    #else
-    AGAPortHelper help( (m_macWindow) ) ;
-    #endif
-    SetOrigin( 0 , 0 ) ;
-    BeginUpdate( m_macWindow ) ;
+
+    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
+
+    BeginUpdate( (WindowRef)m_macWindow ) ;

 
     RgnHandle       updateRgn = NewRgn();    
     RgnHandle       diffRgn = NewRgn() ;
     if ( updateRgn && diffRgn )
     {
 
     RgnHandle       updateRgn = NewRgn();    
     RgnHandle       diffRgn = NewRgn() ;
     if ( updateRgn && diffRgn )
     {

-        GetPortVisibleRegion( GetWindowPort( m_macWindow ), updateRgn );
-        DiffRgn( updateRgn , m_macNoEraseUpdateRgn , diffRgn ) ;
+        GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
+        DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;

         if ( !EmptyRgn( updateRgn ) )
         {
             MacRedraw( updateRgn , timestamp , m_macNeedsErasing || !EmptyRgn( diffRgn )  ) ;
         if ( !EmptyRgn( updateRgn ) )
         {
             MacRedraw( updateRgn , timestamp , m_macNeedsErasing || !EmptyRgn( diffRgn )  ) ;


@@ -340,8 +329,8 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
         DisposeRgn( updateRgn );
     if ( diffRgn )
         DisposeRgn( diffRgn );
         DisposeRgn( updateRgn );
     if ( diffRgn )
         DisposeRgn( diffRgn );

-    EndUpdate( m_macWindow ) ;
-    SetEmptyRgn( m_macNoEraseUpdateRgn ) ;
+    EndUpdate( (WindowRef)m_macWindow ) ;
+    SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;

     m_macNeedsErasing = false ;
 }
 
     m_macNeedsErasing = false ;
 }
 


@@ -349,21 +338,22 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
 // Raise the window to the top of the Z order
 void wxTopLevelWindowMac::Raise()
 {
 // Raise the window to the top of the Z order
 void wxTopLevelWindowMac::Raise()
 {

-    ::BringToFront( m_macWindow ) ;
+    ::BringToFront( (WindowRef)m_macWindow ) ;

 }
 
 // Lower the window to the bottom of the Z order
 void wxTopLevelWindowMac::Lower()
 {
 }
 
 // Lower the window to the bottom of the Z order
 void wxTopLevelWindowMac::Lower()
 {

-    ::SendBehind( m_macWindow , NULL ) ;
+    ::SendBehind( (WindowRef)m_macWindow , NULL ) ;

 }
 
 Point lastWhere ;
 long lastWhen = 0 ;
 extern int wxBusyCursorCount ;
 
 }
 
 Point lastWhere ;
 long lastWhen = 0 ;
 extern int wxBusyCursorCount ;
 

-void wxTopLevelWindowMac::MacFireMouseEvent( EventRecord *ev )
+void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )

 {
 {

+    EventRecord *ev = (EventRecord*) evr ;

     wxMouseEvent event(wxEVT_LEFT_DOWN);
     bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
     bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse
     wxMouseEvent event(wxEVT_LEFT_DOWN);
     bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
     bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse


@@ -401,7 +391,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( EventRecord *ev )
         
     GrafPtr     port ;  
     ::GetPort( &port ) ;
         
     GrafPtr     port ;  
     ::GetPort( &port ) ;

-    ::SetPort( UMAGetWindowPort( m_macWindow ) ) ;
+    ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ;

     ::GlobalToLocal( &localwhere ) ;
     ::SetPort( port ) ;
 
     ::GlobalToLocal( &localwhere ) ;
     ::SetPort( port ) ;
 


@@ -430,13 +420,6 @@ void wxTopLevelWindowMac::MacFireMouseEvent( EventRecord *ev )
     event.m_x += m_x;
     event.m_y += m_y;
 
     event.m_x += m_x;
     event.m_y += m_y;
 

-/*
-    wxPoint origin = GetClientAreaOrigin() ;
-
-    event.m_x += origin.x ;
-    event.m_y += origin.y ;
-*/
-    

     event.m_timeStamp = ev->when;
     event.SetEventObject(this);
     if ( wxTheApp->s_captureWindow )
     event.m_timeStamp = ev->when;
     event.SetEventObject(this);
     if ( wxTheApp->s_captureWindow )


@@ -447,6 +430,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( EventRecord *ev )
         event.m_x = x ;
         event.m_y = y ;
         wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
         event.m_x = x ;
         event.m_y = y ;
         wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;

+        

         if ( ev->what == mouseUp )
         {
             wxTheApp->s_captureWindow = NULL ;
         if ( ev->what == mouseUp )
         {
             wxTheApp->s_captureWindow = NULL ;


@@ -462,12 +446,12 @@ void wxTopLevelWindowMac::MacFireMouseEvent( EventRecord *ev )
     }
 }
 
     }
 }
 

-void wxTopLevelWindowMac::MacMouseDown( EventRecord *ev , short part)
+void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part)

 {
     MacFireMouseEvent( ev ) ;
 }
 
 {
     MacFireMouseEvent( ev ) ;
 }
 

-void wxTopLevelWindowMac::MacMouseUp( EventRecord *ev , short part)
+void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part)

 {
     switch (part)
     {
 {
     switch (part)
     {


@@ -479,7 +463,7 @@ void wxTopLevelWindowMac::MacMouseUp( EventRecord *ev , short part)
     }
 }
 
     }
 }
 

-void wxTopLevelWindowMac::MacMouseMoved( EventRecord *ev , short part)
+void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part)

 {
     switch (part)
     {
 {
     switch (part)
     {


@@ -490,20 +474,20 @@ void wxTopLevelWindowMac::MacMouseMoved( EventRecord *ev , short part)
             break ;
     }
 }
             break ;
     }
 }

-void wxTopLevelWindowMac::MacActivate( EventRecord *ev , bool inIsActivating )
+void wxTopLevelWindowMac::MacActivate( WXEVENTREF ev , bool inIsActivating )

 {
     wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
 {
     wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);

-    event.m_timeStamp = ev->when ;
+    event.m_timeStamp = ((EventRecord*)ev)->when ;

     event.SetEventObject(this);
     
     GetEventHandler()->ProcessEvent(event);
     
     event.SetEventObject(this);
     
     GetEventHandler()->ProcessEvent(event);
     

-    UMAHighlightAndActivateWindow( m_macWindow , inIsActivating ) ;
+    UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;

     
     MacSuperEnabled( inIsActivating ) ;
 }
 
     
     MacSuperEnabled( inIsActivating ) ;
 }
 

-void wxTopLevelWindowMac::MacKeyDown( EventRecord *ev ) 
+void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) 

 {
 }
 
 {
 }
 


@@ -518,7 +502,7 @@ void wxTopLevelWindowMac::SetTitle(const wxString& title)
     else
         label = m_label ;
 
     else
         label = m_label ;
 

-    UMASetWTitleC( m_macWindow , label ) ;
+    UMASetWTitleC( (WindowRef)m_macWindow , label ) ;

 }
 
 bool wxTopLevelWindowMac::Show(bool show)
 }
 
 bool wxTopLevelWindowMac::Show(bool show)


@@ -528,8 +512,8 @@ bool wxTopLevelWindowMac::Show(bool show)
 
     if (show)
     {
 
     if (show)
     {

-      ::ShowWindow( m_macWindow ) ;
-      ::SelectWindow( m_macWindow ) ;
+      ::ShowWindow( (WindowRef)m_macWindow ) ;
+      ::SelectWindow( (WindowRef)m_macWindow ) ;

       // no need to generate events here, they will get them triggered by macos
       // actually they should be , but apparently they are not
       wxSize size(m_width, m_height);
       // no need to generate events here, they will get them triggered by macos
       // actually they should be , but apparently they are not
       wxSize size(m_width, m_height);


@@ -539,7 +523,7 @@ bool wxTopLevelWindowMac::Show(bool show)
     }
     else
     {
     }
     else
     {

-      ::HideWindow( m_macWindow ) ;
+      ::HideWindow( (WindowRef)m_macWindow ) ;

     }
 
     if ( !show )
     }
 
     if ( !show )


@@ -594,10 +578,10 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
         m_height = actualHeight ;
 
         if ( doMove )
         m_height = actualHeight ;
 
         if ( doMove )

-            ::MoveWindow(m_macWindow, m_x, m_y  , false); // don't make frontmost
+            ::MoveWindow((WindowRef)m_macWindow, m_x, m_y  , false); // don't make frontmost

         
         if ( doResize )
         
         if ( doResize )

-            ::SizeWindow(m_macWindow, m_width, m_height  , true); 
+            ::SizeWindow((WindowRef)m_macWindow, m_width, m_height  , true); 

         
         // the OS takes care of invalidating and erasing the new area
         // we have erased the old one   
         
         // the OS takes care of invalidating and erasing the new area
         // we have erased the old one   


@@ -645,11 +629,11 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
  * will get the eraseBackground event first
  */
  
  * will get the eraseBackground event first
  */
  

-void wxTopLevelWindowMac::MacInvalidate( const Rect * rect, bool eraseBackground ) 
+void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) 

 {
   GrafPtr formerPort ;
   GetPort( &formerPort ) ;
 {
   GrafPtr formerPort ;
   GetPort( &formerPort ) ;

-  SetPortWindowPort( m_macWindow ) ;
+  SetPortWindowPort( (WindowRef)m_macWindow ) ;

   
   m_macNeedsErasing |= eraseBackground ;
   
   
   m_macNeedsErasing |= eraseBackground ;
   


@@ -664,11 +648,11 @@ void wxTopLevelWindowMac::MacInvalidate( const Rect * rect, bool eraseBackground
     RgnHandle       diffRgn = NewRgn() ;
     if ( updateRgn && diffRgn )
     {
     RgnHandle       diffRgn = NewRgn() ;
     if ( updateRgn && diffRgn )
     {

-        GetWindowUpdateRgn( m_macWindow , updateRgn );
+        GetWindowUpdateRgn( (WindowRef)m_macWindow , updateRgn );

         Point pt = {0,0} ;
         LocalToGlobal( &pt ) ;
         OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
         Point pt = {0,0} ;
         LocalToGlobal( &pt ) ;
         OffsetRgn( updateRgn , -pt.h , -pt.v ) ;

-        DiffRgn( updateRgn , m_macNoEraseUpdateRgn , diffRgn ) ;
+        DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;

         if ( !EmptyRgn( diffRgn ) )
         {
             m_macNeedsErasing = true ;
         if ( !EmptyRgn( diffRgn ) )
         {
             m_macNeedsErasing = true ;


@@ -682,15 +666,16 @@ void wxTopLevelWindowMac::MacInvalidate( const Rect * rect, bool eraseBackground
     if ( !m_macNeedsErasing )
     {
       RgnHandle rectRgn = NewRgn() ;
     if ( !m_macNeedsErasing )
     {
       RgnHandle rectRgn = NewRgn() ;

-      SetRectRgn( rectRgn , rect->left , rect->top , rect->right , rect->bottom ) ;
-      UnionRgn( m_macNoEraseUpdateRgn , rectRgn , m_macNoEraseUpdateRgn ) ;
+      SetRectRgn( rectRgn , ((Rect*)rect)->left , ((Rect*)rect)->top , ((Rect*)rect)->right , ((Rect*)rect)->bottom ) ;
+      UnionRgn( (RgnHandle) m_macNoEraseUpdateRgn , rectRgn , (RgnHandle) m_macNoEraseUpdateRgn ) ;

       DisposeRgn( rectRgn ) ;
     }
   }
       DisposeRgn( rectRgn ) ;
     }
   }

-  InvalWindowRect( m_macWindow , rect ) ;
+  InvalWindowRect( (WindowRef)m_macWindow , (Rect*)rect ) ;

   // turn this on to debug the refreshing cycle
   // turn this on to debug the refreshing cycle

-#if 0
+#if wxMAC_DEBUG_REDRAW

   PaintRect( rect ) ;
 #endif
   SetPort( formerPort ) ;
 }
   PaintRect( rect ) ;
 #endif
   SetPort( formerPort ) ;
 }

+