fixed wxImage->wxBitmap conversion for images with alpha channel

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 5b136f473cfe55fde7273bca352d03415b5858bd..46dffe8adce7e4e2d61671cd793b512ec5bf2b76 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     19.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -24,10 +24,7 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 
-extern "C"
-{
-    struct GSocketGUIFunctionsTable;
-}
+class GSocketGUIFunctionsTable;
 
 // ----------------------------------------------------------------------------
 // toolkit information
@@ -111,7 +108,12 @@ public:
     virtual void RemoveFromPendingDelete(wxObject *object) = 0;
 
 #if wxUSE_SOCKETS
-    // return table of GUI callbacks for GSocket code or NULL in wxBase
+    // return table of GUI callbacks for GSocket code or NULL in wxBase. This
+    // is needed because networking classes are in their own library and so 
+    // they can't directly call GUI functions (the same net library can be
+    // used in both GUI and base apps). To complicate it further, GUI library
+    // ("wxCore") doesn't depend on networking library and so only a functions
+    // table can be passed around
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0;
 #endif
 
@@ -221,7 +223,7 @@ public:
     #include "wx/unix/apptrait.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptrait.h"
-#elif defined(__OS2__)
+#elif defined(__WXPM__)
     #include "wx/os2/apptrait.h"
 #else 
     // at least, we need an implementation of GetToolkitInfo !