added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index b2ad16aff3176debf439eb17d21c2eb7a0f054bc..a27786e53ccb9cd87e8cf0220350fe5bced9837e 100644 (file)
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -15,10 +15,10 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
+#include "wx/app.h"
 
-#if defined(__POWERPC__) && defined(__DARWIN__)
+#ifdef __DARWIN__
 #    include <Carbon/Carbon.h>
-#    define TARGET_CARBON 1
 #else
 #    include <Quickdraw.h>
 #    include <Appearance.h>
@@ -37,55 +37,75 @@
 
 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 ; }
-
-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 ;
+    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 ; }
+
+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 ;
-       wxDC* m_dc ;
+    DECLARE_NO_COPY_CLASS(wxMacPortSetter)
+        
+public:
+    wxMacPortSetter( const wxDC* dc ) ;
+    ~wxMacPortSetter() ;
+private:
+    wxMacPortStateHelper m_ph ;
+    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
 {
-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 ;
 } ;
 
+// app.h
+bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) ;
 
 // filefn.h
 WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
@@ -109,6 +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 , int forceType = 0 ) ;
 
 #define MAC_WXCOLORREF(a) (*((RGBColor*)&(a)))
 #define MAC_WXHBITMAP(a) (GWorldPtr(a))
@@ -120,5 +141,19 @@ CTabHandle             wxMacCreateColorTable( int numColors ) ;
 #define MAC_WXRECPTR(a) ((Rect*)a)
 #define MAC_WXPOINTPTR(a) ((Point*)a)
 #define MAC_WXHMENU(a) ((MenuHandle)a)
+
+// string conversions / 
+
+#if TARGET_CARBON
+// converts this string into a carbon foundation string with optional pc 2 mac encoding
+CFStringRef wxMacCreateCFString( const wxString &str , bool pc2macEncoding ) ;
+
+// converts this string into a carbon foundation string with optional pc 2 mac encoding
+inline CFStringRef wxMacCreateCFString( const wxString &str ) 
+  { return wxMacCreateCFString( str , wxApp::s_macDefaultEncodingIsPC ) ; }
+
+#endif //TARGET_CARBON
+
+
 #endif
     // _WX_PRIVATE_H_