removed wx/wave.h which was deprecated since 2.4

[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 97c0680bcf393c9250006de9ce9f752c1509fa81..d82bda0e17abe1d884e4e4aa40bc5b26916e349e 100644 (file)
--- a/include/wx/mac/classic/private.h
+++ b/include/wx/mac/classic/private.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        private.h
+// Name:        wx/mac/classic/private.h

 // Purpose:     Private declarations: as this header is only included by
 // Purpose:     Private declarations: as this header is only included by

-//              wxWindows itself, it may contain identifiers which don't start
+//              wxWidgets itself, it may contain identifiers which don't start

 //              with "wx".
 // Author:      Stefan Csomor
 // Modified by:
 //              with "wx".
 // Author:      Stefan Csomor
 // Modified by:


@@ -37,12 +37,12 @@
 
 #include "wx/window.h"
 
 
 #include "wx/window.h"
 

-class wxMacPortStateHelper 
+class wxMacPortStateHelper

 {
     DECLARE_NO_COPY_CLASS(wxMacPortStateHelper)
 {
     DECLARE_NO_COPY_CLASS(wxMacPortStateHelper)

-        
+

 public:
 public:

-    wxMacPortStateHelper( GrafPtr newport) ; 
+    wxMacPortStateHelper( GrafPtr newport) ;

     wxMacPortStateHelper() ;
     ~wxMacPortStateHelper() ;
 
     wxMacPortStateHelper() ;
     ~wxMacPortStateHelper() ;
 


@@ -65,7 +65,7 @@ private:
 class WXDLLEXPORT wxMacPortSetter
 {
     DECLARE_NO_COPY_CLASS(wxMacPortSetter)
 class WXDLLEXPORT wxMacPortSetter
 {
     DECLARE_NO_COPY_CLASS(wxMacPortSetter)

-        
+

 public:
     wxMacPortSetter( const wxDC* dc ) ;
     ~wxMacPortSetter() ;
 public:
     wxMacPortSetter( const wxDC* dc ) ;
     ~wxMacPortSetter() ;


@@ -77,7 +77,7 @@ private:
 class WXDLLEXPORT wxMacWindowClipper
 {
     DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
 class WXDLLEXPORT wxMacWindowClipper
 {
     DECLARE_NO_COPY_CLASS(wxMacWindowClipper)

-        
+

 public:
     wxMacWindowClipper( const wxWindow* win ) ;
     ~wxMacWindowClipper() ;
 public:
     wxMacWindowClipper( const wxWindow* win ) ;
     ~wxMacWindowClipper() ;


@@ -89,11 +89,12 @@ private:
 class wxMacDrawingHelper
 {
     DECLARE_NO_COPY_CLASS(wxMacDrawingHelper)
 class wxMacDrawingHelper
 {
     DECLARE_NO_COPY_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 ) ; }


@@ -118,12 +119,15 @@ WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *path , FSSpec *spec ) ;
 #  ifndef __DARWIN__
 // Mac file names are POSIX (Unix style) under Darwin, so these are not needed
 WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
 #  ifndef __DARWIN__
 // Mac file names are POSIX (Unix style) under Darwin, so these are not needed
 WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;

-WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
-WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
-WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
+WXDLLEXPORT void wxUnixFilename2FSSpec( const wxChar *path , FSSpec *spec ) ;
+WXDLLEXPORT wxString wxMac2UnixFilename( const wxChar *s) ;
+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);


@@ -173,57 +177,57 @@ void wxMacConvertNewlines10To13( wxChar * data ) ;
 
 #if TARGET_CARBON
 
 
 #if TARGET_CARBON
 

-class wxMacCFStringHolder                                                             
-{                                                                           
-public:      
-       wxMacCFStringHolder()
-       {
-       m_cfs = NULL ;
-       m_release = false ;                                                                 
-       }
-                                                                      
-    wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )                                          
-    {      
-       m_cfs = NULL ;
-       m_release = false ;  
-       Assign( str , encoding ) ;
-    }                                                                       
-                                                                            
-    wxMacCFStringHolder(CFStringRef ref , bool release = true )                                                   
-    {                                                                       
+class wxMacCFStringHolder
+{
+public:
+    wxMacCFStringHolder()
+    {
+        m_cfs = NULL ;
+        m_release = false ;
+    }
+
+    wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
+    {
+        m_cfs = NULL ;
+        m_release = false ;
+        Assign( str , encoding ) ;
+    }
+
+    wxMacCFStringHolder(CFStringRef ref , bool release = true )
+    {

         m_cfs = ref ;
         m_cfs = ref ;

-        m_release = release ;                                           
-    }                                                                       
-                                                                            
-    ~wxMacCFStringHolder() 
-    { 
-       Release() ;
-    }                                           
+        m_release = release ;
+    }
+
+    ~wxMacCFStringHolder()
+    {
+        Release() ;
+    }

 
     CFStringRef Detach()
     {
 
     CFStringRef Detach()
     {

-       CFStringRef retval = m_cfs ;
-       m_release = false ;
-       m_cfs = NULL ;
-       return retval ;
-    }         
-                                                                   
+        CFStringRef retval = m_cfs ;
+        m_release = false ;
+        m_cfs = NULL ;
+        return retval ;
+    }
+

     void Release()
     {
     void Release()
     {

-       if ( m_release && m_cfs)
-               CFRelease( m_cfs ) ;
-       m_cfs = NULL ;
-    }         
+        if ( m_release && m_cfs)
+            CFRelease( m_cfs ) ;
+        m_cfs = NULL ;
+    }

 
 

-       void Assign( const wxString &str , wxFontEncoding encoding ) ;
+    void Assign( const wxString &str , wxFontEncoding encoding ) ;

 
 

-    operator CFStringRef () { return m_cfs; }   
+    operator CFStringRef () { return m_cfs; }

     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;

-             
-private:             
-                                                              
+
+private:
+

     CFStringRef m_cfs;
     CFStringRef m_cfs;

-    bool m_release ;                                                        
+    bool m_release ;

 } ;
 
 #endif
 } ;
 
 #endif