Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

[wxWidgets.git] / include / wx / mac / carbon / nonownedwnd.h

diff --git a/include/wx/mac/carbon/nonownedwnd.h b/include/wx/mac/carbon/nonownedwnd.h
index b363149674aacb356450ed299360c03ce58df347..025e3dab7a3e13dae77fed6ba8d1145ca14c0329 100644 (file)
--- a/include/wx/mac/carbon/nonownedwnd.h
+++ b/include/wx/mac/carbon/nonownedwnd.h
@@ -84,13 +84,13 @@ public:
     virtual bool Show( bool show = true );
 
     virtual bool ShowWithEffect(wxShowEffect effect,
     virtual bool Show( bool show = true );
 
     virtual bool ShowWithEffect(wxShowEffect effect,

-                                unsigned timeout = 0,
-                                wxDirection dir = wxBOTTOM);
-   
+                                unsigned timeout = 0)
+        { return MacShowWithEffect(true, effect, timeout); }
+

     virtual bool HideWithEffect(wxShowEffect effect,
     virtual bool HideWithEffect(wxShowEffect effect,

-                                unsigned timeout = 0,
-                                wxDirection dir = wxBOTTOM);
-     
+                                unsigned timeout = 0)
+        { return MacShowWithEffect(false, effect, timeout); }
+

     virtual void SetExtraStyle(long exStyle) ;
 
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual void SetExtraStyle(long exStyle) ;
 
     virtual bool SetBackgroundColour( const wxColour &colour );


@@ -111,6 +111,8 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    bool MacShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
+

     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);


@@ -139,7 +141,7 @@ private :
 };
 
 // list of all frames and modeless dialogs
 };
 
 // list of all frames and modeless dialogs

-extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
+extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows;

 
 
 #endif // _WX_MAC_NONOWNEDWND_H_
 
 
 #endif // _WX_MAC_NONOWNEDWND_H_