X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5273bf2fd3292ec3ab3da4f0c197b2f0e93df32e..6aa3ea889af9d1da98061a2ddad0550105703b73:/include/wx/mac/private.h

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index c7d5bedf72..2afc85b372 100644
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -17,14 +17,24 @@
 #include "wx/defs.h"
 
 #if defined(__POWERPC__) && defined(__DARWIN__)
-        #include <Carbon/Carbon.h>
+#    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
 
+#include "wx/window.h"
+
 class wxMacPortStateHelper 
 {
 public :
@@ -55,6 +65,7 @@ public :
 	~wxMacPortSetter() ;
 private :
 	wxMacPortStateHelper m_ph ;
+	const wxDC* m_dc ;
 } ;
 
 class wxMacDrawingHelper
@@ -98,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))