fixed wxImage->wxBitmap conversion for images with alpha channel

[wxWidgets.git] / include / wx / mac / apptrait.h

diff --git a/include/wx/mac/apptrait.h b/include/wx/mac/apptrait.h
index 88b424ab1adb3de8a0851193ba3f8471225f2f9c..fe7b4791a91714a5b664476f29e57d8960350c5b 100644 (file)
--- a/include/wx/mac/apptrait.h
+++ b/include/wx/mac/apptrait.h
@@ -1,42 +1,5 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/apptrait.h
-// Purpose:     standard implementations of wxAppTraits for MacOS
-// Author:      Vadim Zeitlin
-// Modified by: Stefan Csomor
-// Created:     23.06.2003
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_APPTRAIT_H_
-#define _WX_MAC_APPTRAIT_H_
-
-// ----------------------------------------------------------------------------
-// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
-{
-public:
-    // other miscellaneous helpers
-    // ---------------------------
-
-    virtual wxToolkitInfo& GetToolkitInfo();
-};
-
-#if wxUSE_GUI
-
-class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
-{
-public:
-    // other miscellaneous helpers
-    // ---------------------------
-
-    virtual wxToolkitInfo& GetToolkitInfo();
-};
-
-#endif // wxUSE_GUI
-
-#endif // _WX_MAC_APPTRAIT_H_
-
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/apptrait.h"
+#else
+#include "wx/mac/carbon/apptrait.h"
+#endif
\ No newline at end of file