moved splines rendering code into wxDCBase

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

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index e1c998949556a0c83ed3a72a22df712d59e7f12a..6d27531b26a7687c5d4c2bc5f67e937d20127eee 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -26,7 +26,9 @@
 #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"
 #include "gtk/gtkfeatures.h"

+#endif

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


@@ -40,9 +42,15 @@
     #undef explicit
 #endif // HAVE_X11_XKBLIB_H
 
     #undef explicit
 #endif // HAVE_X11_XKBLIB_H
 

-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxRootWindow;
+
+//----------------------------------------------------------------------------

 // misc.
 // misc.

-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------

 
 void wxBell()
 {
 
 void wxBell()
 {


@@ -71,7 +79,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 
 void *wxGetDisplay()
 {
 
 void *wxGetDisplay()
 {

-    return gdk_display;
+    return GDK_DISPLAY();

 }
 
 void wxDisplaySize( int *width, int *height )
 }
 
 void wxDisplaySize( int *width, int *height )


@@ -80,6 +88,12 @@ void wxDisplaySize( int *width, int *height )
     if (height) *height = gdk_screen_height();
 }
 
     if (height) *height = gdk_screen_height();
 }
 

+void wxDisplaySizeMM( int *width, int *height )
+{
+    if (width) *width = gdk_screen_width_mm();
+    if (height) *height = gdk_screen_height_mm();
+}
+

 void wxGetMousePosition( int* x, int* y )
 {
     gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
 void wxGetMousePosition( int* x, int* y )
 {
     gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );


@@ -92,7 +106,7 @@ bool wxColourDisplay()
 
 int wxDisplayDepth()
 {
 
 int wxDisplayDepth()
 {

-    return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;
+    return gdk_window_get_visual( wxRootWindow->window )->depth;

 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)


@@ -103,6 +117,12 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
   return wxGTK;
 }
 
   return wxGTK;
 }
 

+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
+}
+
+

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