wxComboBox included (removed dependency on wxUSE_COMBOBOX which was never

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 6f27685f98cc3f1f708998e123cbe06cc6b4d911..28d35e2adc6373c11a8181a77264ea69714937f4 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -30,11 +30,11 @@
 #include <netdb.h>
 #include <signal.h>
 
 #include <netdb.h>
 #include <signal.h>
 

-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xresource.h>
-
-#include "gdk/gdkx.h"        // GDK_DISPLAY
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gtk/gtkfeatures.h"
+#include "gdk/gdkx.h"

 
 #ifdef __SVR4__
   #include <sys/systeminfo.h>
 
 #ifdef __SVR4__
   #include <sys/systeminfo.h>


@@ -76,12 +76,7 @@ void wxDisplaySize( int *width, int *height )
 
 void wxGetMousePosition( int* x, int* y )
 {
 
 void wxGetMousePosition( int* x, int* y )
 {

-    Window       dumw;
-    int          dumi;
-    unsigned int dumu;
-    
-    XQueryPointer( GDK_DISPLAY(),GDK_ROOT_WINDOW(),
-                   &dumw,&dumw,x,y,&dumi,&dumi,&dumu );
+    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );

 }
 
 bool wxColourDisplay(void)
 }
 
 bool wxColourDisplay(void)


@@ -91,8 +86,15 @@ bool wxColourDisplay(void)
 
 int wxDisplayDepth(void)
 {
 
 int wxDisplayDepth(void)
 {

-    wxFAIL_MSG( "wxDisplayDepth always returns 8" );
-    return 8;
+    return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;
+}
+
+int wxGetOsVersion(int *majorVsn, int *minorVsn)
+{
+  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
+  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
+  
+  return wxGTK;

 }
 
 //------------------------------------------------------------------------
 }
 
 //------------------------------------------------------------------------


@@ -122,7 +124,8 @@ char *wxGetUserHome( const wxString &user )
        {
             who = getpwnam(ptr);
         }
        {
             who = getpwnam(ptr);
         }

-        // We now make sure the the user exists!
+       
+        /* We now make sure the the user exists! */

         if (who == NULL)
        {
             who = getpwuid(getuid());
         if (who == NULL)
        {
             who = getpwuid(getuid());


@@ -248,37 +251,37 @@ bool wxDirExists( const wxString& dir )
 
 struct wxEndProcessData
 {
 
 struct wxEndProcessData
 {

-  gint pid, tag;
-  wxProcess *process;
+    gint pid, tag;
+    wxProcess *process;

 };
 
 static void GTK_EndProcessDetector(gpointer data, gint source,
                                    GdkInputCondition WXUNUSED(condition) )
 {
 };
 
 static void GTK_EndProcessDetector(gpointer data, gint source,
                                    GdkInputCondition WXUNUSED(condition) )
 {

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

 
 

-  pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
+    pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);

 
 

-  /* wait4 is not part of any standard, use at own risk
-   * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
-   * --- offer@sgi.com */
+    /* wait4 is not part of any standard, use at own risk
+     * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
+     * --- offer@sgi.com */

 #if !defined(__sgi)
 #if !defined(__sgi)

-  wait4(proc_data->pid, NULL, 0, NULL);
+    wait4(proc_data->pid, (int*) NULL, 0, (rusage *) NULL);

 #else
 #else

-  wait3((int *) NULL, 0, (rusage *) NULL);
+    wait3((int *) NULL, 0, (rusage *) NULL);

 #endif
 
 #endif
 

-  close(source);
-  gdk_input_remove(proc_data->tag);
+    close(source);
+    gdk_input_remove(proc_data->tag);

 
 

-  if (proc_data->process)
-    proc_data->process->OnTerminate(proc_data->pid);
+    if (proc_data->process)
+        proc_data->process->OnTerminate(proc_data->pid);

 
 

-  if (proc_data->pid > 0)
-    delete proc_data;
-  else
-    proc_data->pid = 0;
+    if (proc_data->pid > 0)
+        delete proc_data;
+    else
+        proc_data->pid = 0;

 }
 
 long wxExecute( char **argv, bool sync, wxProcess *process )
 }
 
 long wxExecute( char **argv, bool sync, wxProcess *process )


@@ -289,8 +292,9 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
     wxCHECK_MSG( *argv, 0, "can't exec empty command" );
 
     /* Create pipes */
     wxCHECK_MSG( *argv, 0, "can't exec empty command" );
 
     /* Create pipes */

-    if (pipe(end_proc_detect) == -1) {
-      wxLogSysError(_("Pipe creation failed"));
+    if (pipe(end_proc_detect) == -1) 
+    {
+      wxLogSysError( "Pipe creation failed" );

       return 0;
     }
 
       return 0;
     }
 


@@ -300,12 +304,13 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
 #else
     pid_t pid = fork();
 #endif
 #else
     pid_t pid = fork();
 #endif

-    if (pid == -1) {
-        // error
-        wxLogSysError(_("Fork failed"));
+    if (pid == -1) 
+    {
+        wxLogSysError( "Fork failed" );

         return 0;
     }
         return 0;
     }

-    else if (pid == 0) {
+    else if (pid == 0) 
+    {

         // we're in child
         close(end_proc_detect[0]); // close reading side
        // These three lines close the open file descriptors to
         // we're in child
         close(end_proc_detect[0]); // close reading side
        // These three lines close the open file descriptors to


@@ -323,20 +328,23 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
         execvp (*argv, argv);
 #endif
         // there is no return after successful exec()
         execvp (*argv, argv);
 #endif
         // there is no return after successful exec()

-        wxLogSysError(_("Can't execute '%s'"), *argv);
+        wxLogSysError( "Can't execute '%s'", *argv);

 
         _exit(-1);
     }
 
         _exit(-1);
     }

-    else {
+    else 
+    {

       // we're in parent
       close(end_proc_detect[1]); // close writing side
       data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ,
                                 GTK_EndProcessDetector, (gpointer)data);
       data->pid = pid;
       // we're in parent
       close(end_proc_detect[1]); // close writing side
       data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ,
                                 GTK_EndProcessDetector, (gpointer)data);
       data->pid = pid;

-      if (!sync) {
+      if (!sync) 
+      {

         data->process = process;
       }
         data->process = process;
       }

-      else {
+      else 
+      {

         data->process = (wxProcess *) NULL;
         data->pid = -(data->pid);
 
         data->process = (wxProcess *) NULL;
         data->pid = -(data->pid);