declare wxEntry() as taking char **Argv, not char *argv[]

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

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index 61b87e237d5f8deaf5c2bb6ef3dc72c04cb7369e..f34b32ea62682ccc442121921beb4986da4110ce 100644 (file)
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -72,6 +72,18 @@ private:
     const wxDC* m_dc ;
 } ;
 
+class WXDLLEXPORT wxMacWindowClipper
+{
+    DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
+        
+public:
+    wxMacWindowClipper( const wxWindow* win ) ;
+    ~wxMacWindowClipper() ;
+private:
+    RgnHandle m_formerClip ;
+    RgnHandle m_newClip ;
+} ;
+
 class wxMacDrawingHelper
 {
     DECLARE_NO_COPY_CLASS(wxMacDrawingHelper)
@@ -117,7 +129,7 @@ PicHandle       wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ;
 CIconHandle     wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  ) ;
 void                   wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
 CTabHandle         wxMacCreateColorTable( int numColors ) ;
-void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap ) ;
+void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , bool forceColorIcon = false ) ;
 
 #define MAC_WXCOLORREF(a) (*((RGBColor*)&(a)))
 #define MAC_WXHBITMAP(a) (GWorldPtr(a))