Warning fix.

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 4d780162b65bcf16c34789b9fbdb8c0adfb60e0d..f615293ba2820909c5934af7497aea4182d7fdd2 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -11,11 +11,14 @@
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"

-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif

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

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

 
 #include "wx/process.h"
 
 
 #include "wx/process.h"
 


@@ -31,9 +34,6 @@
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"

-#ifndef __WXGTK20__
-#include "gtk/gtkfeatures.h"
-#endif

 #include "gdk/gdkx.h"
 
 #ifdef HAVE_X11_XKBLIB_H
 #include "gdk/gdkx.h"
 
 #ifdef HAVE_X11_XKBLIB_H


@@ -72,16 +72,15 @@ bool wxSetDetectableAutoRepeat( bool flag )
 {
     Bool result;
     XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
 {
     Bool result;
     XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );

-    return result;       /* TRUE if keyboard hardware supports this mode */
+    return result;       /* true if keyboard hardware supports this mode */

 }
 #else
 bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 {
 }
 #else
 bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 {

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 

-#ifdef __WXGTK20__

 // Escapes string so that it is valid Pango markup XML string:
 wxString wxEscapeStringForPangoMarkup(const wxString& str)
 {
 // Escapes string so that it is valid Pango markup XML string:
 wxString wxEscapeStringForPangoMarkup(const wxString& str)
 {


@@ -115,7 +114,6 @@ wxString wxEscapeStringForPangoMarkup(const wxString& str)
     }
     return out;
 }
     }
     return out;
 }

-#endif

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -157,22 +155,18 @@ void wxGetMousePosition( int* x, int* y )
 
 bool wxColourDisplay()
 {
 
 bool wxColourDisplay()
 {

-    return TRUE;
+    return true;

 }
 
 int wxDisplayDepth()
 {
 }
 
 int wxDisplayDepth()
 {

-    return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
+    return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth;

 }
 
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
 }
 
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;

-#ifdef __WXGTK20__

     info.shortName = _T("gtk2");
     info.shortName = _T("gtk2");

-#else
-    info.shortName = _T("gtk");
-#endif

     info.name = _T("wxGTK");
 #ifdef __WXUNIVERSAL__
     info.shortName << _T("univ");
     info.name = _T("wxGTK");
 #ifdef __WXUNIVERSAL__
     info.shortName << _T("univ");


@@ -189,6 +183,34 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     return wxGenericFindWindowAtPoint(pt);
 }
 
     return wxGenericFindWindowAtPoint(pt);
 }
 

+#if !wxUSE_UNICODE
+
+wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc)
+{
+    if ( enc == wxFONTENCODING_UTF8 )
+    {
+        // no need for conversion at all
+        return wxCharBuffer(s);
+    }
+
+    wxWCharBuffer wbuf;
+    if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
+    {
+        wbuf = wxConvUI->cMB2WC(s);
+    }
+    else // another encoding, use generic conversion class
+    {
+        wbuf = wxCSConv(enc).cMB2WC(s);
+    }
+
+    wxCharBuffer buf;
+    if ( wbuf )
+        buf = wxConvUTF8.cWC2MB(wbuf);
+
+    return buf;
+}
+
+#endif // !wxUSE_UNICODE

 
 // ----------------------------------------------------------------------------
 // subprocess routines
 
 // ----------------------------------------------------------------------------
 // subprocess routines


@@ -237,4 +259,3 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 
     return tag;
 }
 
     return tag;
 }

-