compilation warning fix

[wxWidgets.git] / src / gtk / utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 1bc1106f93e420c45945d76e6a8c140b809139cd..e76e3187f3a7eaa9abbad1e279097c06f6a2db73 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -3,13 +3,17 @@
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/utils.h"
 #include "wx/string.h"
 
 #include "wx/utils.h"
 #include "wx/string.h"
 

+#include "wx/apptrait.h"

 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"
 


@@ -52,11 +56,14 @@ extern GtkWidget *wxGetRootWindow();
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------

+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library

 
 void wxBell()
 {
     gdk_beep();
 }
 
 void wxBell()
 {
     gdk_beep();
 }

+#endif

 
 /* Don't synthesize KeyUp events holding down a key and producing
    KeyDown events with autorepeat. */
 
 /* Don't synthesize KeyUp events holding down a key and producing
    KeyDown events with autorepeat. */


@@ -74,6 +81,43 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 }
 #endif
 
 }
 #endif
 

+#ifdef __WXGTK20__
+// Escapes string so that it is valid Pango markup XML string:
+wxString wxEscapeStringForPangoMarkup(const wxString& str)
+{
+    size_t len = str.length();
+    wxString out;
+    out.Alloc(len);
+    for (size_t i = 0; i < len; i++)
+    {
+        wxChar c = str[i];
+        switch (c)
+        {
+            case _T('&'):
+                out << _T("&amp;");
+                break;
+            case _T('<'):
+                out << _T("&lt;");
+                break;
+            case _T('>'):
+                out << _T("&gt;");
+                break;
+            case _T('\''):
+                out << _T("&apos;");
+                break;
+            case _T('"'):
+                out << _T("&quot;");
+                break;
+            default:
+                out << c;
+                break;
+        }
+    }
+    return out;
+}
+#endif
+
+

 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------


@@ -121,12 +165,23 @@ int wxDisplayDepth()
     return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
 }
 
     return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
 }
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()

 {
 {

-  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
-  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
-
-  return wxGTK;
+    static wxToolkitInfo info;
+#ifdef __WXGTK20__
+    info.shortName = _T("gtk2");
+#else
+    info.shortName = _T("gtk");
+#endif
+    info.name = _T("wxGTK");
+#ifdef __WXUNIVERSAL__
+    info.shortName << _T("univ");
+    info.name << _T("/wxUniversal");
+#endif
+    info.versionMajor = gtk_major_version;
+    info.versionMinor = gtk_minor_version;
+    info.os = wxGTK;
+    return info;

 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)