Renamed wxDataViewCell to wxDataViewRenderer since the

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 5b136f473cfe55fde7273bca352d03415b5858bd..1de2cfea7d464f58267a4fbd8398cb9575a73887 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$
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -13,6 +13,7 @@
 #define _WX_APPTRAIT_H_
 
 #include "wx/string.h"
 #define _WX_APPTRAIT_H_
 
 #include "wx/string.h"

+#include "wx/platinfo.h"

 
 class WXDLLIMPEXP_BASE wxObject;
 class WXDLLEXPORT wxAppTraits;
 
 class WXDLLIMPEXP_BASE wxObject;
 class WXDLLEXPORT wxAppTraits;


@@ -24,37 +25,21 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 

-extern "C"
-{
-    struct GSocketGUIFunctionsTable;
-}
-
-// ----------------------------------------------------------------------------
-// toolkit information
-// ----------------------------------------------------------------------------
-
-// Information about the toolkit that the app is running under (e.g. wxMSW):
-struct WXDLLIMPEXP_BASE wxToolkitInfo
-{
-    // 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;
-};
+class GSocketGUIFunctionsTable;

 
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
 
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 

+class WXDLLIMPEXP_BASE wxStandardPathsBase;
+

 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:

+    // needed since this class declares virtual members
+    virtual ~wxAppTraitsBase() { }
+

     // hooks for creating the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 
     // hooks for creating the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 


@@ -78,6 +63,11 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 

+#if wxUSE_STDPATHS
+    // wxStandardPaths object is normally the same for wxBase and wxGUI
+    // except in the case of wxMac and wxCocoa
+    virtual wxStandardPathsBase& GetStandardPaths();
+#endif // wxUSE_STDPATHS

 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------
 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------


@@ -111,28 +101,34 @@ public:
     virtual void RemoveFromPendingDelete(wxObject *object) = 0;
 
 #if wxUSE_SOCKETS
     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
 
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0;
 #endif
 

+    // return information about the (native) toolkit currently used;
+    // returns wxPORT_BASE for console applications and one of the remaining
+    // wxPORT_* values for GUI applications.
+    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const = 0;

 
 

-    // 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;
+    // return true if the port is using wxUniversal for the GUI, false if not
+    virtual bool IsUsingUniversalWidgets() const = 0;

 };
 
 // ----------------------------------------------------------------------------
 // include the platform-specific version of the class
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // 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__)
+// NB:  test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
+//      Unix code (and otherwise __UNIX__ wouldn't be defined)
+// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/apptbase.h"
+#elif defined(__WIN32__)

     #include "wx/msw/apptbase.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptbase.h"
     #include "wx/msw/apptbase.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptbase.h"


@@ -177,6 +173,19 @@ public:
 
     virtual void ScheduleForDestroy(wxObject *object);
     virtual void RemoveFromPendingDelete(wxObject *object);
 
     virtual void ScheduleForDestroy(wxObject *object);
     virtual void RemoveFromPendingDelete(wxObject *object);

+
+    // the GetToolkitVersion for console application is always the same
+    virtual wxPortId GetToolkitVersion(int *verMaj, int *verMin) const
+    {
+        // no toolkits (wxBase is for console applications without GUI support)
+        // NB: zero means "no toolkit", -1 means "not initialized yet"
+        //     so we must use zero here!
+        if (verMaj) *verMaj = 0;
+        if (verMin) *verMin = 0;
+        return wxPORT_BASE;
+    }
+
+    virtual bool IsUsingUniversalWidgets() const { return false; }

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -207,6 +216,15 @@ public:
 
     virtual void ScheduleForDestroy(wxObject *object);
     virtual void RemoveFromPendingDelete(wxObject *object);
 
     virtual void ScheduleForDestroy(wxObject *object);
     virtual void RemoveFromPendingDelete(wxObject *object);

+
+    virtual bool IsUsingUniversalWidgets() const
+    {
+    #ifdef __WXUNIVERSAL__
+        return true;
+    #else
+        return false;
+    #endif
+    }

 };
 
 #endif // wxUSE_GUI
 };
 
 #endif // wxUSE_GUI


@@ -215,25 +233,27 @@ public:
 // include the platform-specific version of the classes above
 // ----------------------------------------------------------------------------
 
 // include the platform-specific version of the classes above
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMSW__)
+// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/apptrait.h"
+#elif defined(__WIN32__)

     #include "wx/msw/apptrait.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptrait.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptrait.h"
     #include "wx/msw/apptrait.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptrait.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptrait.h"

-#elif defined(__OS2__)
+#elif defined(__WXPM__)

     #include "wx/os2/apptrait.h"
     #include "wx/os2/apptrait.h"

-#else 
-    // at least, we need an implementation of GetToolkitInfo !
+#elif defined(__DOS__)
+    #include "wx/msdos/apptrait.h"
+#else

     #if wxUSE_GUI
         class wxGUIAppTraits : public wxGUIAppTraitsBase
         {
     #if wxUSE_GUI
         class wxGUIAppTraits : public wxGUIAppTraitsBase
         {

-            virtual wxToolkitInfo& GetToolkitInfo();

         };
     #endif // wxUSE_GUI
         };
     #endif // wxUSE_GUI

-    class wxConsoleAppTraits: public wxConsoleAppTraitsBase 
+    class wxConsoleAppTraits: public wxConsoleAppTraitsBase

     {
     {

-        virtual wxToolkitInfo& GetToolkitInfo();

     };
 #endif // platform
 
     };
 #endif // platform