Solaris /usr/bin/tr requires [] around character ranges

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

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index aa78392df7f110bc6460ebe425b35b33ac919f11..314b3a1c85c7f570d7fa0be55156e053c6e1e1b7 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -32,31 +32,6 @@ typedef SInt32 SRefCon;
 
 #ifndef __LP64__
 
 
 #ifndef __LP64__
 

-class 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; }
-
-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 wxMacPortSaver
 {
     DECLARE_NO_COPY_CLASS(wxMacPortSaver)
 class WXDLLEXPORT wxMacPortSaver
 {
     DECLARE_NO_COPY_CLASS(wxMacPortSaver)


@@ -68,17 +43,6 @@ private :
     GrafPtr m_port;
 };
 
     GrafPtr m_port;
 };
 

-class WXDLLEXPORT wxMacPortSetter
-{
-    DECLARE_NO_COPY_CLASS(wxMacPortSetter)
-
-public:
-    wxMacPortSetter( const wxDC* dc );
-    ~wxMacPortSetter();
-private:
-    wxMacPortStateHelper m_ph;
-    const wxDC* m_dc;
-};

 
 /*
  Clips to the visible region of a control within the current port
 
 /*
  Clips to the visible region of a control within the current port


@@ -152,7 +116,10 @@ private:
 */
 
 // app.h
 */
 
 // app.h

+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5

 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec);
 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec);

+#endif

 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 


@@ -1079,11 +1046,9 @@ OSStatus WXDLLEXPORT wxMacDrawCGImage(
                                const HIRect *  inBounds,
                                CGImageRef      inImage) ;
 
                                const HIRect *  inBounds,
                                CGImageRef      inImage) ;
 

-CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;
-
-CGColorSpaceRef wxMacGetGenericRGBColorSpace(void);
+CGColorRef WXDLLEXPORT wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;

 
 

-void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size);
+CGColorSpaceRef WXDLLEXPORT wxMacGetGenericRGBColorSpace(void);

 
 // toplevel.cpp
 
 
 // toplevel.cpp