X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26e83d4ff19f1e03bee1c70b920ae9ff89a62b3b..f816930c05be30305b20b96fe6f704e496db4f15:/include/wx/mac/private.h?ds=sidebyside

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index 1e2aa805d5..af3ab308ec 100644
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -15,65 +15,81 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
-#include "wx/window.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 :
-	wxMacPortStateHelper( GrafPtr newport) ; 
-	wxMacPortStateHelper() ;
-	~wxMacPortStateHelper() ;
+    DECLARE_NO_COPY_CLASS(wxMacPortStateHelper)
+        
+public:
+    wxMacPortStateHelper( GrafPtr newport) ; 
+    wxMacPortStateHelper() ;
+    ~wxMacPortStateHelper() ;
 
-	void Setup( GrafPtr newport ) ;
-	void Clear() ;
-	bool IsCleared() { return m_clip == NULL ; }
-	GrafPtr GetCurrentPort() { return m_currentPort ; }
+    void Setup( GrafPtr newport ) ;
+    void Clear() ;
+    bool IsCleared() { return m_clip == NULL ; }
+    GrafPtr GetCurrentPort() { return m_currentPort ; }
 
-private :
-	GrafPtr			m_currentPort ;
-	GrafPtr			m_oldPort ;
-	RgnHandle		m_clip ;
-	ThemeDrawingState m_drawingState ;
-	short			m_textFont ;
-	short			m_textSize ;
-	short			m_textStyle ;
-	short 		m_textMode ;
+private:
+    GrafPtr	      m_currentPort ;
+    GrafPtr	      m_oldPort ;
+    RgnHandle	      m_clip ;
+    ThemeDrawingState m_drawingState ;
+    short	      m_textFont ;
+    short	      m_textSize ;
+    short	      m_textStyle ;
+    short 	      m_textMode ;
 } ;
 
 class WXDLLEXPORT wxMacPortSetter
 {
-public :
-	wxMacPortSetter( const wxDC* dc ) ;
-	~wxMacPortSetter() ;
-private :
-	wxMacPortStateHelper m_ph ;
+    DECLARE_NO_COPY_CLASS(wxMacPortSetter)
+        
+public:
+    wxMacPortSetter( const wxDC* dc ) ;
+    ~wxMacPortSetter() ;
+private:
+    wxMacPortStateHelper m_ph ;
+    const wxDC* m_dc ;
 } ;
 
 class wxMacDrawingHelper
 {
-public :
-	wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
-	~wxMacDrawingHelper() ;
-	bool Ok() { return m_ok ; }
-	void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ) ; }
-	void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ) ; }
-	void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ) ; }
-  const Point& GetOrigin() { return m_origin ; }
-private :
-  Point     m_origin ;
-	GrafPtr 	m_formerPort ;
-	GrafPtr		m_currentPort ;
-	PenState 	m_savedPenState ;
-	bool			m_ok ;
+    DECLARE_NO_COPY_CLASS(wxMacDrawingHelper)
+        
+public:
+    wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
+    ~wxMacDrawingHelper() ;
+    bool Ok() { return m_ok ; }
+    void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ) ; }
+    void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ) ; }
+    void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ) ; }
+    const Point& GetOrigin() { return m_origin ; }
+private:
+    Point     m_origin ;
+    GrafPtr   m_formerPort ;
+    GrafPtr   m_currentPort ;
+    PenState  m_savedPenState ;
+    bool      m_ok ;
 } ;
 
 
@@ -99,6 +115,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))