#ifndef _WX_APPTRAIT_H_
#define _WX_APPTRAIT_H_
-class WXDLLEXPORT wxObject;
+#include "wx/string.h"
+
+class WXDLLIMPEXP_BASE wxObject;
class WXDLLEXPORT wxAppTraits;
#if wxUSE_FONTMAP
class WXDLLEXPORT wxFontMapper;
#endif // wxUSE_FONTMAP
-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxMessageOutput;
+class WXDLLIMPEXP_BASE wxLog;
+class WXDLLIMPEXP_BASE wxMessageOutput;
+class WXDLLEXPORT wxRendererNative;
+class WXDLLIMPEXP_BASE wxString;
+
+extern "C"
+{
+ struct GSocketGUIFunctionsTable;
+}
// ----------------------------------------------------------------------------
-// wxAppTraits: this class defines various configurable aspects of wxApp
+// toolkit information
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxAppTraitsBase
+// Information about the toolkit that the app is running under (e.g. wxMSW):
+struct WXDLLIMPEXP_BASE wxToolkitInfo
{
-public:
- // wxAppTraits is an ABC, but we also provide 2 standard implementations of
- // it, one for the console apps and the other for the GUI ones
- static wxAppTraits *CreateConsole();
-#if wxUSE_GUI
- static wxAppTraits *CreateGUI();
-#endif // wxUSE_GUI
+ // Short name of the toolkit (e.g. "msw" or "mswuniv"); empty for console:
+ wxString shortName;
+ // Descriptive name of the toolkit, human readable (e.g. "wxMSW" or
+ // "wxMSW/Universal"); "wxBase" for console apps:
+ wxString name;
+ // Version of the underlying toolkit or of the OS for console apps:
+ int versionMajor, versionMinor;
+ // OS mnenomics, e.g. wxGTK or wxMSW:
+ int os;
+};
+// ----------------------------------------------------------------------------
+// wxAppTraits: this class defines various configurable aspects of wxApp
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxAppTraitsBase
+{
+public:
// hooks for creating the global objects, may be overridden by the user
// ------------------------------------------------------------------------
virtual wxFontMapper *CreateFontMapper() = 0;
#endif // wxUSE_FONTMAP
+ // get the renderer to use for drawing the generic controls (return value
+ // may be NULL in which case the default renderer for the current platform
+ // is used); this is used in GUI only and always returns NULL in console
+ //
+ // NB: returned pointer will be deleted by the caller
+ virtual wxRendererNative *CreateRenderer() = 0;
+
// functions abstracting differences between GUI and console modes
// ------------------------------------------------------------------------
// wxBase
virtual void RemoveFromPendingDelete(wxObject *object) = 0;
-
- // other miscellaneous helpers
- // ---------------------------
-
- // wxGetOsVersion() behaves differently in GUI and non-GUI builds under
- // Unix: in the former case it returns the information about the toolkit
- // and in the latter -- about the OS, so we need to virtualize it
- virtual int GetOSVersion(int *verMaj, int *verMin) = 0;
+#if wxUSE_SOCKETS
+ // 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
+
+
+ // return information about what toolkit is running; we need for two things
+ // that are both contained in wxBase:
+ // - wxGetOsVersion() behaves differently in GUI and non-GUI builds under
+ // Unix: in the former case it returns the information about the toolkit
+ // and in the latter -- about the OS, so we need to virtualize it
+ // - wxDynamicLibrary::CanonicalizePluginName() must embed toolkit
+ // signature in DLL name
+ virtual wxToolkitInfo& GetToolkitInfo() = 0;
};
// ----------------------------------------------------------------------------
// include the platform-specific version of the class
// ----------------------------------------------------------------------------
+// NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
+// Unix code (and otherwise __UNIX__ wouldn't be defined)
#if defined(__WXMSW__)
#include "wx/msw/apptbase.h"
-#elif defined(__UNIX__)
+#elif defined(__UNIX__) && !defined(__EMX__)
#include "wx/unix/apptbase.h"
+#elif defined(__WXMAC__)
+ #include "wx/mac/apptbase.h"
+#elif defined(__OS2__)
+ #include "wx/os2/apptbase.h"
#else // no platform-specific methods to add to wxAppTraits
- typedef
// wxAppTraits must be a class because it was forward declared as class
- class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase
+ class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
{
};
#endif // platform
// wxConsoleAppTraitsBase: wxAppTraits implementation for the console apps
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxConsoleAppTraitsBase : public wxAppTraits
+class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits
{
public:
#if wxUSE_LOG
#if wxUSE_FONTMAP
virtual wxFontMapper *CreateFontMapper();
#endif // wxUSE_FONTMAP
+ virtual wxRendererNative *CreateRenderer();
+#if wxUSE_SOCKETS
+ virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
+#endif
#ifdef __WXDEBUG__
virtual bool ShowAssertDialog(const wxString& msg);
#if wxUSE_FONTMAP
virtual wxFontMapper *CreateFontMapper();
#endif // wxUSE_FONTMAP
+ virtual wxRendererNative *CreateRenderer();
+#if wxUSE_SOCKETS
+ virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
+#endif
#ifdef __WXDEBUG__
virtual bool ShowAssertDialog(const wxString& msg);
#if defined(__WXMSW__)
#include "wx/msw/apptrait.h"
-#elif defined(__UNIX__)
+#elif defined(__UNIX__) && !defined(__EMX__)
#include "wx/unix/apptrait.h"
-#else // no platform-specific methods to add to wxAppTraits
+#elif defined(__WXMAC__)
+ #include "wx/mac/apptrait.h"
+#elif defined(__WXPM__)
+ #include "wx/os2/apptrait.h"
+#else
+ // at least, we need an implementation of GetToolkitInfo !
#if wxUSE_GUI
- typedef wxGUIAppTraitsBase wxGUIAppTraits;
+ class wxGUIAppTraits : public wxGUIAppTraitsBase
+ {
+ virtual wxToolkitInfo& GetToolkitInfo();
+ };
#endif // wxUSE_GUI
- typedef wxConsoleAppTraitsBase wxConsoleAppTraits;
+ class wxConsoleAppTraits: public wxConsoleAppTraitsBase
+ {
+ virtual wxToolkitInfo& GetToolkitInfo();
+ };
#endif // platform
#endif // _WX_APPTRAIT_H_
projects / wxWidgets.git / blobdiff