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

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

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index a0f211607a25bf9f5b9531fad0b30f9f3913ecce..2afc85b37267f4953addd031d927f4abff75f08f 100644 (file)
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -20,8 +20,15 @@
 #    include <Carbon/Carbon.h>
 #    define TARGET_CARBON 1
 #else
-#    include "MacHeaders.c"
+#    include <Quickdraw.h>
+#    include <Appearance.h>
+#    include <Folders.h>
+#    include <Controls.h>
+#    include <ControlDefinitions.h>
+#    include <LowMem.h>
+#    include <Gestalt.h>
 #endif
+
 #if UNIVERSAL_INTERFACES_VERSION < 0x0340
     #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
 #endif
@@ -58,6 +65,7 @@ public :
        ~wxMacPortSetter() ;
 private :
        wxMacPortStateHelper m_ph ;
+       const wxDC* m_dc ;
 } ;
 
 class wxMacDrawingHelper
@@ -101,6 +109,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 ) ;
 
 #define MAC_WXCOLORREF(a) (*((RGBColor*)&(a)))
 #define MAC_WXHBITMAP(a) (GWorldPtr(a))