Tried to fix GTK+ 2.0 compilos

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index f8195c8a2320403edc1bfbaa269a5434367ffa3e..070fa2672573272b1c2dd7a9f1903089d9452215 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -442,6 +442,7 @@ void wxPrintData::ConvertToNative()
                // DEVMODE is in tenths of a milimeter
             devMode->dmPaperWidth = m_paperSize.x * 10;
             devMode->dmPaperLength = m_paperSize.y * 10;
                // DEVMODE is in tenths of a milimeter
             devMode->dmPaperWidth = m_paperSize.x * 10;
             devMode->dmPaperLength = m_paperSize.y * 10;

+            devMode->dmPaperSize = DMPAPER_USER;

             devMode->dmFields |= DM_PAPERWIDTH;
             devMode->dmFields |= DM_PAPERLENGTH;
         }
             devMode->dmFields |= DM_PAPERWIDTH;
             devMode->dmFields |= DM_PAPERLENGTH;
         }

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 680bbce0f0b1d91ac3bf956ac82573e5ee867897..e7345fe6a9686827ca2f14b5a5709df00ec0a207 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -630,11 +630,14 @@ int wxEntryStart( int argc, char *argv[] )
 
     gtk_set_locale();
 
 
     gtk_set_locale();
 

+    // 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;
 #if defined(__WXGTK20__)
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;

-#elif wxUSE_WCHAR_T
+#else

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

+#endif

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


@@ -654,7 +657,6 @@ int wxEntryStart( int argc, char *argv[] )
     return 0;
 }
 
     return 0;
 }
 

-

 int wxEntryInitGui()
 {
     int retValue = 0;
 int wxEntryInitGui()
 {
     int retValue = 0;

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index e9c98c66c818ac8964c68f95b354319f84434369..925fa24ba7265c46fec9774d4bdbdac8b4afae32 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1341,7 +1341,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 

-#ifdef __WXGTK20__
+#if defined(__WXGTK20__) && wxUSE_WCHAR_T

     /* FIXME: the layout engine should probably be abstracted at a higher level in wxDC... */
     PangoLayout *layout = pango_layout_new(m_context);
     pango_layout_set_font_description(layout, m_fontdesc);
     /* FIXME: the layout engine should probably be abstracted at a higher level in wxDC... */
     PangoLayout *layout = pango_layout_new(m_context);
     pango_layout_set_font_description(layout, m_fontdesc);

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 680bbce0f0b1d91ac3bf956ac82573e5ee867897..e7345fe6a9686827ca2f14b5a5709df00ec0a207 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -630,11 +630,14 @@ int wxEntryStart( int argc, char *argv[] )
 
     gtk_set_locale();
 
 
     gtk_set_locale();
 

+    // 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;
 #if defined(__WXGTK20__)
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;

-#elif wxUSE_WCHAR_T
+#else

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

+#endif

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


@@ -654,7 +657,6 @@ int wxEntryStart( int argc, char *argv[] )
     return 0;
 }
 
     return 0;
 }
 

-

 int wxEntryInitGui()
 {
     int retValue = 0;
 int wxEntryInitGui()
 {
     int retValue = 0;

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index e9c98c66c818ac8964c68f95b354319f84434369..925fa24ba7265c46fec9774d4bdbdac8b4afae32 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1341,7 +1341,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 

-#ifdef __WXGTK20__
+#if defined(__WXGTK20__) && wxUSE_WCHAR_T

     /* FIXME: the layout engine should probably be abstracted at a higher level in wxDC... */
     PangoLayout *layout = pango_layout_new(m_context);
     pango_layout_set_font_description(layout, m_fontdesc);
     /* FIXME: the layout engine should probably be abstracted at a higher level in wxDC... */
     PangoLayout *layout = pango_layout_new(m_context);
     pango_layout_set_font_description(layout, m_fontdesc);

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index b1fc34928b9519ade594faa37332e9042f643091..ff2944ef8c4ce59443d6c4bcd0b09f9e630518a3 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1023,6 +1023,8 @@ $(CFG): makefile.b32
 -D__WXMSW__
 -D__WINDOWS__
 -DWIN32
 -D__WXMSW__
 -D__WINDOWS__
 -DWIN32

+-DWINVER=0x0400
+-D_WIN32_WINNT=0x0400

 $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)
 $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)