Hopefully finish removing the old wxCocoa port.

Get rid of the rest of __WXCOCOA__ tests in the sources. Drop configure option for using it. Also remove the documentation for this port. This should have also been part of r76735. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-03 22:03:21 +00:00
parent 161809ef8c
commit fb99672f62
43 changed files with 56 additions and 536 deletions
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -32,7 +32,7 @@ enum wxAcceleratorEntryFlags
    wxACCEL_ALT     = 0x0001,   // hold Alt key down
    wxACCEL_CTRL    = 0x0002,   // hold Ctrl key down
    wxACCEL_SHIFT   = 0x0004,   // hold Shift key down
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
+#if defined(__WXMAC__)
    wxACCEL_RAW_CTRL= 0x0008,   // 
 #else
    wxACCEL_RAW_CTRL= wxACCEL_CTRL,
@@ -164,8 +164,6 @@ private:
    #include "wx/gtk1/accel.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/accel.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/generic/accel.h"
 #endif

 extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -71,7 +71,6 @@ protected:
 #if defined(__WXDFB__) || \
    defined(__WXMAC__) || \
    defined(__WXGTK__) || \
-    defined(__WXCOCOA__) || \
    defined(__WXMOTIF__) || \
    defined(__WXX11__)
    #define wxUSE_BITMAP_BASE 1
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -65,7 +65,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE)
    not need the wxGDIObject machinery to handle colors, please add it to the
    list of ports which do not need it.
 */
-#if defined( __WXMAC__ ) || defined( __WXMSW__ ) || defined( __WXCOCOA__ )
+#if defined( __WXMAC__ ) || defined( __WXMSW__ )
 #define wxCOLOUR_IS_GDIOBJECT 0
 #else
 #define wxCOLOUR_IS_GDIOBJECT 1
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -29,7 +29,6 @@
         !defined(__WXOSX_CARBON__)   && \
         !defined(__WXOSX_COCOA__)   && \
         !defined(__WXOSX_IPHONE__)   && \
-         !defined(__WXCOCOA__) && \
         !defined(__X__)       && \
         !defined(__WXDFB__)   && \
         !defined(__WXX11__)   && \
@@ -2642,7 +2641,7 @@ enum wxKeyModifier
    wxMOD_SHIFT     = 0x0004,
    wxMOD_META      = 0x0008,
    wxMOD_WIN       = wxMOD_META,
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
+#if defined(__WXMAC__)
    wxMOD_RAW_CONTROL = 0x0010,
 #else
    wxMOD_RAW_CONTROL = wxMOD_CONTROL,
@@ -2963,7 +2962,7 @@ typedef MenuRef WXHMENU;

 #endif

-#if defined( __WXCOCOA__ ) || defined(__WXMAC__)
+#if defined(__WXMAC__)

 /* Definitions of 32-bit/64-bit types
 * These are typedef'd exactly the same way in newer OS X headers so
@@ -3064,10 +3063,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSView);
 DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext);
 DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLPixelFormat);
 DECLARE_WXCOCOA_OBJC_CLASS( NSPrintInfo );
-#ifndef __WXMAC__
-typedef WX_NSView WXWidget; /*  wxWidgets BASE definition */
-#endif
-#endif /*  __WXCOCOA__  || ( __WXMAC__ &__DARWIN__)*/
+#endif /* __WXMAC__ &__DARWIN__ */

 #ifdef __WXMAC__

--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -104,8 +104,7 @@ protected:
 #elif defined(__WXMAC__)
    #include "wx/osx/dirdlg.h"      // Native Mac
 #elif defined(__WXMOTIF__) || \
-      defined(__WXX11__)   || \
-      defined(__WXCOCOA__)
+      defined(__WXX11__)
    #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation
    #define wxDirDialog wxGenericDirDialog
 #endif
--- a/include/wx/encinfo.h
+++ b/include/wx/encinfo.h
@@ -37,8 +37,7 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
    wxFontEncoding encoding;    // so that we know what this struct represents

 #if defined(__WXMSW__) || \
-    defined(__WXMAC__) || \
-    defined(__WXCOCOA__) // FIXME: __WXCOCOA__
+    defined(__WXMAC__)

    wxNativeEncodingInfo()
        : facename()
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -32,9 +32,9 @@
 #endif

 /*  taskbar is implemented in the major ports */
-#if defined(__WXMSW__) || defined(__WXCOCOA__) \
+#if defined(__WXMSW__) \
    || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) \
-    || defined(__WXOSX_MAC__) || defined(__WXCOCOA__)
+    || defined(__WXOSX_MAC__)
    #define wxHAS_TASK_BAR_ICON
 #else
    #undef wxUSE_TASKBARICON
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -65,7 +65,6 @@ protected:

 #if defined(__WXUNIVERSAL__) || \
    defined(__WXMOTIF__)     || \
-    defined(__WXCOCOA__)     || \
    defined(__WXWINCE__)     || \
    defined(__WXGPE__)

--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -29,7 +29,7 @@

 // GTK and Mac always have native implementation of the indeterminate mode
 // wxMSW has native implementation only if comctl32.dll >= 6.00
-#if !defined(__WXGTK20__) && !defined(__WXMAC__) && !defined(__WXCOCOA__)
+#if !defined(__WXGTK20__) && !defined(__WXMAC__)
    #define wxGAUGE_EMULATE_INDETERMINATE_MODE 1
 #else
    #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -206,8 +206,7 @@ enum wxStockCursor
      defined(__WXMOTIF__) || \
      defined(__WXX11__)   || \
      defined(__WXMAC__)   || \
-      defined(__WXDFB__)   || \
-      defined(__WXCOCOA__)
+      defined(__WXDFB__)
    // Initialize from an included XPM
    #define wxBITMAP(name) wxBitmap(name##_xpm)
 #else // other platforms
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -13,7 +13,7 @@

 #if wxUSE_WEBKIT

-#if !defined(__WXMAC__) && !defined(__WXCOCOA__)
+#if !defined(__WXMAC__)
 #error "wxWebKitCtrl not implemented for this platform"
 #endif

--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -348,8 +348,7 @@ public:
    // wxUniv always uses the generic MDI implementation and so do the ports
    // without native version (although wxCocoa seems to have one -- but it's
    // probably not functional?)
-    #if defined(__WXCOCOA__) || \
-        defined(__WXMOTIF__) || \
+    #if defined(__WXMOTIF__) || \
        defined(__WXUNIVERSAL__)
        #define wxUSE_GENERIC_MDI_AS_NATIVE   1
    #else
--- a/include/wx/mediactrl.h
+++ b/include/wx/mediactrl.h
@@ -222,8 +222,7 @@ protected:
    //inheritance issues
 #if defined(__WXOSX_CARBON__)
    virtual void MacVisibilityChanged();
-#endif
-#if defined(__WXOSX_CARBON__) || defined(__WXCOCOA__)
+
    friend class wxQTMediaBackend;
 #endif
    class wxMediaBackend* m_imp;
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -31,7 +31,7 @@ public:
    #include "wx/msw/palette.h"
 #elif defined(__WXX11__) || defined(__WXMOTIF__)
    #include "wx/x11/palette.h"
-#elif defined(__WXGTK__) || defined(__WXCOCOA__)
+#elif defined(__WXGTK__)
    #include "wx/generic/paletteg.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/palette.h"
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -533,25 +533,9 @@
 #endif

 /*
-    __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) and wxCocoa ports under OS X.
-
-    DO NOT use this define in base library code.  Although wxMac has its own
-    private base library (and thus __WXOSX_OR_COCOA__,__WXMAC__ and related defines are
-    valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
-
-    To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ for wxCocoa when
-    not compiling the base library.  We determine this by first checking if
-    wxUSE_BASE is not defined.  If it is not defined, then we're not buildling
-    the base library, and possibly not building wx at all (but actually building
-    user code that's using wx). If it is defined then we must check to make sure
-    it is not true.  If it is true, we're building base.
-
-    If you want it in the common darwin base library then use __DARWIN__.  You
-    can use any Darwin-available libraries like CoreFoundation but please avoid
-    using OS X libraries like Carbon or CoreServices.
-
+    This is obsolete and kept for backwards compatibility only.
 */
-#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+#if defined(__WXOSX__)
 #   define __WXOSX_OR_COCOA__ 1
 #endif

--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -159,11 +159,6 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
    typedef wxPixelFormat<unsigned char, 32, 1, 2, 3> wxNativePixelFormat;

    #define wxPIXEL_FORMAT_ALPHA 0
-#elif defined(__WXCOCOA__)
-    // Cocoa is standard RGB or RGBA (normally it is RGBA)
-    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
-
-    #define wxPIXEL_FORMAT_ALPHA 3
 #elif defined(__WXGTK__)
    // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA
    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
--- a/include/wx/ribbon/art.h
+++ b/include/wx/ribbon/art.h
@@ -928,8 +928,7 @@ protected:
 typedef wxRibbonMSWArtProvider wxRibbonDefaultArtProvider;
 #elif defined(__WXOSX_CARBON__) || \
      defined(__WXOSX_COCOA__) || \
-      defined(__WXOSX_IPHONE__) || \
-      defined(__WXCOCOA__)
+      defined(__WXOSX_IPHONE__)
 // TODO: Once implemented, change typedef to OSX
 // typedef wxRibbonOSXArtProvider wxRibbonDefaultArtProvider;
 typedef wxRibbonAUIArtProvider wxRibbonDefaultArtProvider;
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -627,7 +627,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
    #define wxFNCONV(name) wxConvFileName->cWX2MB(name)
    #define wxFNSTRINGCAST wxMBSTRINGCAST
 #else
-#if defined( __WXOSX_OR_COCOA__ ) && wxMBFILES
+#if defined(__WXOSX__) && wxMBFILES
    #define wxFNCONV(name) wxConvFileName->cWC2MB( wxConvLocal.cWX2WC(name) )
 #else
    #define wxFNCONV(name) name
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -466,8 +466,6 @@ private:
    #include "wx/generic/treectlg.h"
 #elif defined(__WXMAC__)
    #include "wx/generic/treectlg.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/generic/treectlg.h"
 #endif

 #endif // wxUSE_TREECTRL
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -58,7 +58,7 @@ public:
    virtual void MutexGuiLeave();
 #endif

-#if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
+#if defined(__WXMAC__) && wxUSE_STDPATHS
    virtual wxStandardPaths& GetStandardPaths();
 #endif
    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const wxOVERRIDE;