wxMemoryDC constructor now optionally accepts a wxBitmap parameter,

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

diff --git a/include/wx/mac/classic/private.h b/include/wx/mac/classic/private.h
index bba9746c3eb4f24b483d82632ed9d90f119075cf..68a28a653f8e393837008d3b9edb1a479df68967 100644 (file)
--- a/include/wx/mac/classic/private.h
+++ b/include/wx/mac/classic/private.h
@@ -8,7 +8,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_


@@ -93,7 +93,8 @@ class wxMacDrawingHelper
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
     ~wxMacDrawingHelper() ;
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
     ~wxMacDrawingHelper() ;

-    bool Ok() { return m_ok ; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() { 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 ) ; }
     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 ) ; }


@@ -124,6 +125,9 @@ WXDLLEXPORT wxString wxUnix2MacFilename( const wxChar *s);
 #  endif
 
 // utils.h
 #  endif
 
 // utils.h

+WXDLLEXPORT wxString wxMacFindFolderNoSeparator(short vRefNum,
+                                                OSType folderType,
+                                                Boolean createFolder);

 WXDLLEXPORT wxString wxMacFindFolder(short vRefNum,
                                      OSType folderType,
                                      Boolean createFolder);
 WXDLLEXPORT wxString wxMacFindFolder(short vRefNum,
                                      OSType folderType,
                                      Boolean createFolder);