Don't assume that msw.remap was 1, instead change it back to what it

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 6b9ddf198c6a8e4242d229ba5a38d8310704624d..8255d6178cc6de324b6e2f31557493a88100b1cd 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "app.h"
-#endif
-

 #ifdef __VMS
 // vms_jackets.h should for proper working be included before anything else
 # include <vms_jackets.h>
 #ifdef __VMS
 // vms_jackets.h should for proper working be included before anything else
 # include <vms_jackets.h>


@@ -76,7 +72,8 @@
     #include <unistd.h>
 #endif // HAVE_POLL/!HAVE_POLL
 
     #include <unistd.h>
 #endif // HAVE_POLL/!HAVE_POLL
 

-#include "wx/gtk/win_gtk.h"
+#include "wx/unix/private.h"
+#include "wx/gtk1/win_gtk.h"

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 


@@ -136,9 +133,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // never finish.
     wxTheApp->RemoveIdleTag();
 
     // never finish.
     wxTheApp->RemoveIdleTag();
 

+#if wxUSE_LOG

     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();

+#endif

 
     while (gtk_events_pending())
         gtk_main_iteration();
 
     while (gtk_events_pending())
         gtk_main_iteration();


@@ -151,8 +150,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // return value of Processidle().
     ProcessIdle();
 
     // return value of Processidle().
     ProcessIdle();
 

+#if wxUSE_LOG

     // let the logs be flashed again
     wxLog::Resume();
     // let the logs be flashed again
     wxLog::Resume();

+#endif

 
     wxIsInsideYield = FALSE;
 
 
     wxIsInsideYield = FALSE;
 


@@ -172,21 +173,17 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
 void wxApp::WakeUpIdle()
 {
 
 void wxApp::WakeUpIdle()
 {

-#ifndef __WXGTK20__

 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();
 #endif // wxUSE_THREADS_
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();
 #endif // wxUSE_THREADS_

-#endif // __WXGTK2__

 
     wxapp_install_idle_handler();
 
 
     wxapp_install_idle_handler();
 

-#ifndef __WXGTK20__

 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiLeave();
 #endif // wxUSE_THREADS_
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiLeave();
 #endif // wxUSE_THREADS_

-#endif // __WXGTK2__

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


@@ -244,11 +241,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
         if (wxTopLevelWindows.GetCount() > 0)
         {
             wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
         if (wxTopLevelWindows.GetCount() > 0)
         {
             wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();

-#ifdef __WXGTK20__
-            if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
-#else

             if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
             if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))

-#endif

                 win->OnInternalIdle();
         }
         return TRUE;
                 win->OnInternalIdle();
         }
         return TRUE;


@@ -306,23 +299,23 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
     fd_set readfds;
     fd_set writefds;
     fd_set exceptfds;
     fd_set readfds;
     fd_set writefds;
     fd_set exceptfds;

-    FD_ZERO(&readfds);
-    FD_ZERO(&writefds);
-    FD_ZERO(&exceptfds);
+    wxFD_ZERO(&readfds);
+    wxFD_ZERO(&writefds);
+    wxFD_ZERO(&exceptfds);

 
     unsigned int i;
     for ( i = 0; i < nfds; i++ )
     {
 
     unsigned int i;
     for ( i = 0; i < nfds; i++ )
     {

-        wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
+        wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") );

 
         if ( ufds[i].events & G_IO_IN )
 
         if ( ufds[i].events & G_IO_IN )

-            FD_SET(ufds[i].fd, &readfds);
+            wxFD_SET(ufds[i].fd, &readfds);

 
         if ( ufds[i].events & G_IO_PRI )
 
         if ( ufds[i].events & G_IO_PRI )

-            FD_SET(ufds[i].fd, &exceptfds);
+            wxFD_SET(ufds[i].fd, &exceptfds);

 
         if ( ufds[i].events & G_IO_OUT )
 
         if ( ufds[i].events & G_IO_OUT )

-            FD_SET(ufds[i].fd, &writefds);
+            wxFD_SET(ufds[i].fd, &writefds);

 
         if ( ufds[i].fd > fdMax )
             fdMax = ufds[i].fd;
 
         if ( ufds[i].fd > fdMax )
             fdMax = ufds[i].fd;


@@ -336,13 +329,13 @@ int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
     {
         ufds[i].revents = 0;
 
     {
         ufds[i].revents = 0;
 

-        if ( FD_ISSET(ufds[i].fd, &readfds ) )
+        if ( wxFD_ISSET(ufds[i].fd, &readfds ) )

             ufds[i].revents |= G_IO_IN;
 
             ufds[i].revents |= G_IO_IN;
 

-        if ( FD_ISSET(ufds[i].fd, &exceptfds ) )
+        if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )

             ufds[i].revents |= G_IO_PRI;
 
             ufds[i].revents |= G_IO_PRI;
 

-        if ( FD_ISSET(ufds[i].fd, &writefds ) )
+        if ( wxFD_ISSET(ufds[i].fd, &writefds ) )

             ufds[i].revents |= G_IO_OUT;
     }
 
             ufds[i].revents |= G_IO_OUT;
     }
 


@@ -468,14 +461,9 @@ bool wxApp::OnInitGui()
     // chosen a specific visual, then derive the GdkVisual from that
     if (m_glVisualInfo != NULL)
     {
     // chosen a specific visual, then derive the GdkVisual from that
     if (m_glVisualInfo != NULL)
     {

-#ifdef __WXGTK20__
-        // seems gtk_widget_set_default_visual no longer exists?
-        GdkVisual* vis = gtk_widget_get_default_visual();
-#else

         GdkVisual* vis = gdkx_visual_get(
             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
         GdkVisual* vis = gdkx_visual_get(
             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );

-#endif

 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );


@@ -489,13 +477,8 @@ bool wxApp::OnInitGui()
     else
     if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
     {
     else
     if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
     {

-#ifdef __WXGTK20__
-        /* seems gtk_widget_set_default_visual no longer exists? */
-        GdkVisual* vis = gtk_widget_get_default_visual();
-#else

         GdkVisual* vis = gdk_visual_get_best();
         gtk_widget_set_default_visual( vis );
         GdkVisual* vis = gdk_visual_get_best();
         gtk_widget_set_default_visual( vis );

-#endif

 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );


@@ -574,7 +557,7 @@ GdkVisual *wxApp::GetGdkVisual()
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     bool init_result;
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     bool init_result;

-    
+

 #if wxUSE_THREADS
     // GTK 1.2 up to version 1.2.3 has broken threads
     if ((gtk_major_version == 1) &&
 #if wxUSE_THREADS
     // GTK 1.2 up to version 1.2.3 has broken threads
     if ((gtk_major_version == 1) &&


@@ -594,13 +577,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     // We should have the wxUSE_WCHAR_T test on the _outside_
 #if wxUSE_WCHAR_T
 
     // We should have the wxUSE_WCHAR_T test on the _outside_
 #if wxUSE_WCHAR_T

-    #if defined(__WXGTK20__)
-        // gtk+ 2.0 supports Unicode through UTF-8 strings
-        wxConvCurrent = &wxConvUTF8;
-    #else // GTK 1.x

         if (!wxOKlibc())
             wxConvCurrent = &wxConvLocal;
         if (!wxOKlibc())
             wxConvCurrent = &wxConvLocal;

-    #endif

 #else // !wxUSE_WCHAR_T
     if (!wxOKlibc())
         wxConvCurrent = (wxMBConv*) NULL;
 #else // !wxUSE_WCHAR_T
     if (!wxOKlibc())
         wxConvCurrent = (wxMBConv*) NULL;


@@ -618,7 +596,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     argvGTK[argc] = NULL;
 
     int argcGTK = argc;
     argvGTK[argc] = NULL;
 
     int argcGTK = argc;

-    
+

 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );
 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?
     gpe_application_init( &argcGTK, &argvGTK );


@@ -658,7 +636,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
         return false;
     }
         wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
         return false;
     }

-    
+

     // we can not enter threads before gtk_init is done
     gdk_threads_enter();
 
     // we can not enter threads before gtk_init is done
     gdk_threads_enter();