X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7332d96bd5b57c75f31c0f09493a67ce95bd2453..35ff90a0b30bf24fcb9478a3c43143c124bbff46:/include/wx/apptrait.h diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index dcc488e1e2..5c6c9a19a4 100644 --- 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 +// Copyright: (c) 2003 Vadim Zeitlin // 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 @@ -223,7 +225,7 @@ public: #include "wx/mac/apptrait.h" #elif defined(__WXPM__) #include "wx/os2/apptrait.h" -#else +#else // at least, we need an implementation of GetToolkitInfo ! #if wxUSE_GUI class wxGUIAppTraits : public wxGUIAppTraitsBase @@ -231,7 +233,7 @@ public: virtual wxToolkitInfo& GetToolkitInfo(); }; #endif // wxUSE_GUI - class wxConsoleAppTraits: public wxConsoleAppTraitsBase + class wxConsoleAppTraits: public wxConsoleAppTraitsBase { virtual wxToolkitInfo& GetToolkitInfo(); };