Applied patch [ 1736135 ] AUI: Clicking caption ignored on centered panel

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

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index c8837d8f2e7524477c0f69533fd023d6a361576b..7cd7c37ef9dd33dbe976155ac193c66f8eca9bff 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -1,77 +1,120 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utils.cpp
+// Name:        src/gtk1/utilsgtk.cpp

 // 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/utils.h"

-#include "wx/string.h"

 
 

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

 
 

+#include "wx/apptrait.h"
+#include "wx/gtk1/private/timer.h"
+#include "wx/evtloop.h"

 #include "wx/process.h"
 
 #include "wx/unix/execute.h"
 
 #include <stdarg.h>
 #include "wx/process.h"
 
 #include "wx/unix/execute.h"
 
 #include <stdarg.h>

-#include <dirent.h>

 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>

+#include <sys/wait.h>   // for WNOHANG

 #include <unistd.h>
 #include <unistd.h>

-#include <sys/wait.h>
-#include <pwd.h>
-#include <errno.h>
-#include <netdb.h>
-#include <signal.h>
-#include <fcntl.h>          // for O_WRONLY and friends
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkfeatures.h>
-#include <gdk/gdkx.h>
-
-#ifdef __HPUX__
-    // under HP-UX XKBlib.h defines structures with field named "explicit" -
-    // which is, of course, an error for a C++ compiler
+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gtk/gtkfeatures.h"
+#include "gdk/gdkx.h"
+
+#ifdef HAVE_X11_XKBLIB_H
+    /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
+     * field named "explicit" - which is, of course, an error for a C++
+     * compiler. To be on the safe side, just redefine it everywhere. */

     #define explicit __wx_explicit
     #define explicit __wx_explicit

+

     #include "X11/XKBlib.h"
     #include "X11/XKBlib.h"

+

     #undef explicit
     #undef explicit

-#endif // __HPUX__
+#endif // HAVE_X11_XKBLIB_H

 
 

-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+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

 
 

-// 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. */
+#ifdef HAVE_X11_XKBLIB_H

 bool wxSetDetectableAutoRepeat( bool flag )
 {
     Bool result;
     XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
 bool wxSetDetectableAutoRepeat( bool flag )
 {
     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) )
+{
+    return false;

 }
 }

+#endif

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

+void *wxGetDisplay()
+{
+    return GDK_DISPLAY();
+}
+

 void wxDisplaySize( int *width, int *height )
 {
     if (width) *width = gdk_screen_width();
     if (height) *height = gdk_screen_height();
 }
 
 void wxDisplaySize( int *width, int *height )
 {
     if (width) *width = gdk_screen_width();
     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 wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+    // This is supposed to return desktop dimensions minus any window
+    // manager panels, menus, taskbars, etc.  If there is a way to do that
+    // for this platform please fix this function, otherwise it defaults
+    // to the entire desktop.
+    if (x) *x = 0;
+    if (y) *y = 0;
+    wxDisplaySize(width, height);
+}
+

 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 );


@@ -79,35 +122,56 @@ void wxGetMousePosition( int* x, int* y )
 
 bool wxColourDisplay()
 {
 
 bool wxColourDisplay()
 {

-    return TRUE;
+    return true;

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

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

 }
 
 }
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

 {
 {

-  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
-  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
-
-  return wxGTK;
+    return wxGenericFindWindowAtPoint(pt);

 }
 
 }
 

+

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

-static void GTK_EndProcessDetector(gpointer data, gint source,
-                                   GdkInputCondition WXUNUSED(condition) )
+extern "C" {
+static
+void GTK_EndProcessDetector(gpointer data, gint source,
+                            GdkInputCondition WXUNUSED(condition) )

 {
 {

-    wxEndProcessData *proc_data = (wxEndProcessData *)data;
+   wxEndProcessData *proc_data = (wxEndProcessData *)data;

 
 

-    wxHandleProcessTermination(proc_data);
+   // has the process really terminated? unfortunately GDK (or GLib) seem to
+   // generate G_IO_HUP notification even when it simply tries to read from a
+   // closed fd and hasn't terminated at all
+   int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
+   int status = 0;
+   int rc = waitpid(pid, &status, WNOHANG);

 
 

-    close(source);
-    gdk_input_remove(proc_data->tag);
+   if ( rc == 0 )
+   {
+       // no, it didn't exit yet, continue waiting
+       return;
+   }
+
+   // set exit code to -1 if something bad happened
+   proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
+                                                      : -1;
+
+   // child exited, end waiting
+   close(source);
+
+   // don't call us again!
+   gdk_input_remove(proc_data->tag);
+
+   wxHandleProcessTermination(proc_data);
+}

 }
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 }
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)


@@ -120,3 +184,34 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
     return tag;
 }
 
     return tag;
 }
 

+wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+    return new wxGTKTimerImpl(timer);
+}
+
+// ----------------------------------------------------------------------------
+// wxPlatformInfo-related
+// ----------------------------------------------------------------------------
+
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
+{
+    if ( verMaj )
+        *verMaj = gtk_major_version;
+    if ( verMin )
+        *verMin = gtk_minor_version;
+
+    return wxPORT_GTK;
+}
+
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop;
+}
+
+#if wxUSE_INTL
+void wxGUIAppTraits::SetLocale()
+{
+    gtk_set_locale();
+}
+#endif
+