Remove the inclusions of wx/cocoa headers which don't exist any more.

This should have been part of r76735: in addition to removing the old Cocoa port headers, also remove the references to them from the common include files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-02 13:28:42 +00:00 · 2014-07-02 13:28:42 +00:00 · 1ca1d77e01
commit 1ca1d77e01
parent 8ebe2c4066
50 changed files with 0 additions and 116 deletions
--- a/include/wx/anybutton.h
+++ b/include/wx/anybutton.h
@ -186,8 +186,6 @@ protected:
 //    #include "wx/gtk1/anybutton.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/anybutton.h"
-//#elif defined(__WXCOCOA__)
-//    #include "wx/cocoa/anybutton.h"
 #else
    typedef wxAnyButtonBase wxAnyButton;
 #endif
--- a/include/wx/app.h
+++ b/include/wx/app.h
@ -706,8 +706,6 @@ protected:
    #include "wx/x11/app.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/app.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/app.h"
 #endif

 #else // !GUI
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@ -287,9 +287,6 @@ protected:
 #elif defined(__WXMAC__)
    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_PICT_RESOURCE
    #include "wx/osx/bitmap.h"
-#elif defined(__WXCOCOA__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
-    #include "wx/cocoa/bitmap.h"
 #endif

 #if wxUSE_IMAGE
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@ -123,8 +123,6 @@ protected:
    #include "wx/gtk1/bmpbuttn.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/bmpbuttn.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/bmpbuttn.h"
 #endif

 #endif // wxUSE_BMPBUTTON
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@ -81,8 +81,6 @@ public:
    #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/brush.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/brush.h"
 #endif

 class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase
--- a/include/wx/button.h
+++ b/include/wx/button.h
@ -58,8 +58,6 @@ protected:
    #include "wx/gtk1/button.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/button.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/button.h"
 #endif

 #endif // wxUSE_BUTTON
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@ -178,8 +178,6 @@ private:
    #include "wx/gtk1/checkbox.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/checkbox.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/checkbox.h"
 #endif

 #endif // wxUSE_CHECKBOX
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@ -55,8 +55,6 @@ public:
    #include "wx/gtk1/checklst.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/checklst.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/checklst.h"
 #endif

 #endif // wxUSE_CHECKLISTBOX
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@ -1225,8 +1225,6 @@
 #  endif
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
-#elif defined(__WXCOCOA__)
-#  include "wx/cocoa/chkconf.h"
 #elif defined(__WXMAC__)
 #  include "wx/osx/chkconf.h"
 #elif defined(__WXDFB__)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@ -86,8 +86,6 @@ private:
    #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/choice.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/choice.h"
 #endif

 #endif // wxUSE_CHOICE
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@ -161,8 +161,6 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
    #include "wx/x11/clipbrd.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/clipbrd.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/clipbrd.h"
 #endif

 // ----------------------------------------------------------------------------
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@ -219,8 +219,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
    #include "wx/x11/colour.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/colour.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/colour.h"
 #endif

 #define wxColor wxColour
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@ -81,8 +81,6 @@ public:
    #include "wx/gtk1/combobox.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/combobox.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/combobox.h"
 #endif

 #endif // wxUSE_COMBOBOX
--- a/include/wx/control.h
+++ b/include/wx/control.h
@ -236,8 +236,6 @@ protected:
    #include "wx/gtk1/control.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/control.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/control.h"
 #endif

 #endif // wxUSE_CONTROLS
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@ -58,9 +58,6 @@ public:
 #elif defined(__WXMAC__)
    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_MACCURSOR_RESOURCE
    #include "wx/osx/cursor.h"
-#elif defined(__WXCOCOA__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_MACCURSOR_RESOURCE
-    #include "wx/cocoa/cursor.h"
 #endif

 #include "wx/utils.h"
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@ -83,8 +83,6 @@ public:
    #include "wx/x11/dataform.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/dataform.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/dataform.h"
 #endif

 // the value for default argument to some functions (corresponds to
@ -169,8 +167,6 @@ public:
    #include "wx/gtk1/dataobj.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/dataobj.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/dataobj.h"
 #endif

 // ----------------------------------------------------------------------------
@ -560,8 +556,6 @@ private:
        #include "wx/motif/dataobj2.h"
    #elif defined(__WXMAC__)
        #include "wx/osx/dataobj2.h"
-    #elif defined(__WXCOCOA__)
-        #include "wx/cocoa/dataobj2.h"
    #endif

    // wxURLDataObject is simply wxTextDataObject with a different name
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@ -360,8 +360,6 @@ public:
        #include "wx/gtk1/dialog.h"
    #elif defined(__WXMAC__)
        #include "wx/osx/dialog.h"
-    #elif defined(__WXCOCOA__)
-        #include "wx/cocoa/dialog.h"
    #endif
 #endif

--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@ -103,8 +103,6 @@ protected:
    #define wxDirDialog wxGenericDirDialog
 #elif defined(__WXMAC__)
    #include "wx/osx/dirdlg.h"      // Native Mac
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/dirdlg.h"    // Native Cocoa
 #elif defined(__WXMOTIF__) || \
      defined(__WXX11__)   || \
      defined(__WXCOCOA__)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@ -290,8 +290,6 @@ private:

 #if defined(__WXMSW__)
    #include "wx/msw/evtloop.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/evtloop.h"
 #elif defined(__WXOSX__)
    #include "wx/osx/evtloop.h"
 #elif defined(__WXDFB__)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@ -218,8 +218,6 @@ wxSaveFileSelector(const wxString& what,
    #include "wx/gtk1/filedlg.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/filedlg.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/filedlg.h"
 #endif

 #endif // wxUSE_FILEDLG
--- a/include/wx/font.h
+++ b/include/wx/font.h
@ -530,8 +530,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
    #include "wx/dfb/font.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/font.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/font.h"
 #endif

 class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@ -264,8 +264,6 @@ protected:
        #include "wx/motif/frame.h"
    #elif defined(__WXMAC__)
        #include "wx/osx/frame.h"
-    #elif defined(__WXCOCOA__)
-        #include "wx/cocoa/frame.h"
    #endif
 #endif

--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@ -109,8 +109,6 @@ protected:
    #include "wx/gtk1/gauge.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/gauge.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/gauge.h"
 #endif

 #endif // wxUSE_GAUGE
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@ -194,8 +194,6 @@ public:
    #include "wx/gtk1/glcanvas.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/glcanvas.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/glcanvas.h"
 #else
    #error "wxGLCanvas not supported in this wxWidgets port"
 #endif
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@ -52,9 +52,6 @@
  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_PNG_RESOURCE
  #include "wx/generic/icon.h"
 #endif
-#elif defined(__WXCOCOA__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE
-  #include "wx/cocoa/icon.h"
 #endif

 //-----------------------------------------------------------------------------
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@ -153,8 +153,6 @@ private:
  #include "wx/gtk1/listbox.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/listbox.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/listbox.h"
 #endif

 #endif // wxUSE_LISTBOX
--- a/include/wx/log.h
+++ b/include/wx/log.h
@ -1494,11 +1494,6 @@ wxSafeShowMessage(const wxString& title, const wxString& text);
    #define wxLogLastError(api) wxLogNop()
 #endif // wxUSE_LOG_DEBUG/!wxUSE_LOG_DEBUG

-// wxCocoa has additiional trace masks
-#if defined(__WXCOCOA__)
-#include "wx/cocoa/log.h"
-#endif
-
 // macro which disables debug logging in release builds: this is done by
 // default by wxIMPLEMENT_APP() so usually it doesn't need to be used explicitly
 #if defined(NDEBUG) && wxUSE_LOG_DEBUG
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@ -367,8 +367,6 @@ public:
    #include "wx/gtk1/mdi.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/mdi.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/mdi.h"
 #endif

 inline wxMDIClientWindow *wxMDIParentFrameBase::OnCreateClient()
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@ -589,8 +589,6 @@ protected:
    #include "wx/gtk1/menu.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/menu.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/menu.h"
 #endif
 #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY

--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@ -204,8 +204,6 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text);
    #include "wx/gtk1/menuitem.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/menuitem.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/menuitem.h"
 #endif
 #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY

--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@ -292,8 +292,6 @@ private:
    (defined(__WXGTK__) && !defined(__WXGTK20__))

    #define wxMessageDialog wxGenericMessageDialog
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/msgdlg.h"
 #elif defined(__WXMSW__)
    #include "wx/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@ -193,8 +193,6 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTEBOOK_PAGE_CHANGING, wxBook
    #include  "wx/gtk1/notebook.h"
 #elif defined(__WXMAC__)
    #include  "wx/osx/notebook.h"
-#elif defined(__WXCOCOA__)
-    #include  "wx/cocoa/notebook.h"
 #endif

 // old wxEVT_COMMAND_* constants
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@ -109,8 +109,6 @@ public:
    #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/pen.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/pen.h"
 #endif

 class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@ -163,8 +163,6 @@ private:
    #include "wx/gtk1/radiobox.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/radiobox.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/radiobox.h"
 #endif

 #endif // wxUSE_RADIOBOX
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@ -46,8 +46,6 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[];
    #include "wx/gtk1/radiobut.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/radiobut.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/radiobut.h"
 #endif

 #endif // wxUSE_RADIOBTN
--- a/include/wx/region.h
+++ b/include/wx/region.h
@ -222,8 +222,6 @@ protected:
    #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/region.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/region.h"
 #endif

 // ----------------------------------------------------------------------------
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@ -74,8 +74,6 @@ private:
    #include "wx/gtk1/scrolbar.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/scrolbar.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/scrolbar.h"
 #endif

 #endif // wxUSE_SCROLLBAR
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@ -139,8 +139,6 @@ private:
    #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/slider.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/slider.h"
 #endif

 #endif // wxUSE_SLIDER
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@ -56,8 +56,6 @@ protected:

 #if defined(__WINDOWS__)
    #include "wx/msw/sound.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/sound.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/sound.h"
 #elif defined(__UNIX__)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@ -86,8 +86,6 @@ protected:
    #include "wx/gtk1/spinbutt.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/spinbutt.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/spinbutt.h"
 #endif

 // ----------------------------------------------------------------------------
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@ -64,8 +64,6 @@ protected:
    #include "wx/gtk1/statbmp.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/statbmp.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/statbmp.h"
 #endif

 #endif // wxUSE_STATBMP
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@ -64,8 +64,6 @@ protected:
    #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/statbox.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/statbox.h"
 #endif

 #endif // wxUSE_STATBOX
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@ -92,8 +92,6 @@ protected:
    #include "wx/gtk1/statline.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/statline.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/statline.h"
 #else // use generic implementation for all other platforms
    #include "wx/generic/statline.h"
 #endif
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@ -97,8 +97,6 @@ private:
    #include "wx/gtk1/stattext.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/stattext.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/stattext.h"
 #endif

 #endif // !wxNO_PORT_STATTEXT_INCLUDE
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@ -83,8 +83,6 @@ private:
    #include "wx/unix/taskbarx11.h"
 #elif defined (__WXMAC__)
    #include "wx/osx/taskbarosx.h"
-#elif defined (__WXCOCOA__)
-    #include "wx/cocoa/taskbar.h"
 #endif

 // ----------------------------------------------------------------------------
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@ -785,8 +785,6 @@ protected:
    #include "wx/gtk1/textctrl.h"
 #elif defined(__WXMAC__)
    #include "wx/osx/textctrl.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/textctrl.h"
 #endif

 // ----------------------------------------------------------------------------
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@ -81,8 +81,6 @@ enum
        #include "wx/gtk1/toolbar.h"
    #elif defined(__WXMAC__)
       #include "wx/osx/toolbar.h"
-    #elif defined(__WXCOCOA__)
-       #include "wx/cocoa/toolbar.h"
    #endif
 #endif // wxUSE_TOOLBAR

--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@ -25,8 +25,6 @@
 #include "wx/gtk1/tooltip.h"
 #elif defined(__WXMAC__)
 #include "wx/osx/tooltip.h"
-#elif defined(__WXCOCOA__)
-#include "wx/cocoa/tooltip.h"
 #endif

 #endif
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@ -362,9 +362,6 @@ protected:
 #elif defined(__WXMAC__)
    #include "wx/osx/toplevel.h"
    #define wxTopLevelWindowNative wxTopLevelWindowMac
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/toplevel.h"
-    #define wxTopLevelWindowNative wxTopLevelWindowCocoa
 #elif defined(__WXMOTIF__)
    #include "wx/motif/toplevel.h"
    #define wxTopLevelWindowNative wxTopLevelWindowMotif
--- a/include/wx/window.h
+++ b/include/wx/window.h
@ -1915,13 +1915,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
        #define wxWindowMac wxWindow
    #endif // wxUniv
    #include "wx/osx/window.h"
-#elif defined(__WXCOCOA__)
-    #ifdef __WXUNIVERSAL__
-        #define wxWindowNative wxWindowCocoa
-    #else // !wxUniv
-        #define wxWindowCocoa wxWindow
-    #endif // wxUniv
-    #include "wx/cocoa/window.h"
 #endif

 // for wxUniversal, we now derive the real wxWindow from wxWindow<platform>,