minor fix to wxFileName::MakeRelativeTo(), removed broken and misleading IsWild(...

[wxWidgets.git] / include / wx / mac / toplevel.h

diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h
index c005292f65c0c02688ed527663af0031790e201a..89f8cc9580c9380bcfb1f78543f8da35a9a8224c 100644 (file)
--- a/include/wx/mac/toplevel.h
+++ b/include/wx/mac/toplevel.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mac/toplevel.h
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mac/toplevel.h

-// Purpose:     wxTopLevelWindowMac is the MSW implementation of wxTLW
+// Purpose:     wxTopLevelWindowMac is the Mac implementation of wxTLW

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.01
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.01


@@ -55,6 +55,7 @@ public:
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);

+    virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }

     virtual void Restore();
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) { return FALSE; }
     virtual void Restore();
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) { return FALSE; }


@@ -68,24 +69,24 @@ public:
            const wxSize& size,
            long style,
            const wxString& name ) ;
            const wxSize& size,
            long style,
            const wxString& name ) ;

-       static WindowRef MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
-       virtual void MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;
+       static WXWindow MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
+       virtual void MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXWindow *window , wxWindowMac** rootwin ) ;

   virtual void Clear() ;
   virtual void Clear() ;

-  virtual ControlHandle MacGetContainerForEmbedding() ;
-  WindowRef MacGetWindowRef() { return m_macWindow ; }
-       virtual void MacActivate( EventRecord *ev , bool inIsActivating ) ;
+  virtual WXWidget MacGetContainerForEmbedding() ;
+  WXWindow MacGetWindowRef() { return m_macWindow ; }
+       virtual void MacActivate( WXEVENTREF ev , bool inIsActivating ) ;

        virtual void MacUpdate( long timestamp ) ;
        virtual void MacUpdate( long timestamp ) ;

-       virtual void MacMouseDown( EventRecord *ev , short windowPart ) ;
-       virtual void MacMouseUp( EventRecord *ev , short windowPart ) ;
-       virtual void MacMouseMoved( EventRecord *ev , short windowPart ) ;
-       virtual void MacKeyDown( EventRecord *ev ) ;
-       virtual void MacFireMouseEvent( EventRecord *ev ) ;
+       virtual void MacMouseDown( WXEVENTREF ev , short windowPart ) ;
+       virtual void MacMouseUp( WXEVENTREF ev , short windowPart ) ;
+       virtual void MacMouseMoved( WXEVENTREF ev , short windowPart ) ;
+       virtual void MacKeyDown( WXEVENTREF ev ) ;
+       virtual void MacFireMouseEvent( WXEVENTREF ev ) ;

   virtual void Raise();
   virtual void Lower();
   virtual void SetTitle( const wxString& title);
   virtual bool Show( bool show = TRUE );
   virtual void DoMoveWindow(int x, int y, int width, int height);
   virtual void Raise();
   virtual void Lower();
   virtual void SetTitle( const wxString& title);
   virtual bool Show( bool show = TRUE );
   virtual void DoMoveWindow(int x, int y, int width, int height);

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

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -97,14 +98,14 @@ protected:
     // when it is called while the frame is hidden
     bool m_maximizeOnShow;
 
     // when it is called while the frame is hidden
     bool m_maximizeOnShow;
 

-    SInt16 m_macWindowBackgroundTheme ;
-    WindowRef m_macWindow ;
-    ControlHandle m_macRootControl ;
+    short m_macWindowBackgroundTheme ;
+    WXWindow m_macWindow ;
+    WXWidget m_macRootControl ;

     wxWindowMac* m_macFocus ;
     wxWindowMac* m_macFocus ;

-    RgnHandle m_macNoEraseUpdateRgn ;
+    WXHRGN m_macNoEraseUpdateRgn ;

     bool m_macNeedsErasing ;
 
     bool m_macNeedsErasing ;
 

-         static WindowRef s_macWindowInUpdate ;
+         static WXWindow s_macWindowInUpdate ;

 };
 
 // list of all frames and modeless dialogs
 };
 
 // list of all frames and modeless dialogs


@@ -112,8 +113,8 @@ extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
 
 // associate mac windows with wx counterparts
 
 
 // associate mac windows with wx counterparts
 

-wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow ) ;
-void wxAssociateWinWithMacWindow(WindowRef inWindow, wxTopLevelWindowMac *win) ;
+wxTopLevelWindowMac* wxFindWinFromMacWindow( WXWindow inWindow ) ;
+void wxAssociateWinWithMacWindow(WXWindow inWindow, wxTopLevelWindowMac *win) ;

 void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win) ;
 
 
 void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win) ;