Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tried to fix GTK+ 2.0 compilos

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-02-13 12:10:54 +00:00
parent b742792c08
commit f9862abdc9
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/cmndata.cpp
View File

@@ -442,6 +442,7 @@ void wxPrintData::ConvertToNative()
// DEVMODE is in tenths of a milimeter // DEVMODE is in tenths of a milimeter
devMode->dmPaperWidth = m_paperSize.x * 10; devMode->dmPaperWidth = m_paperSize.x * 10;
devMode->dmPaperLength = m_paperSize.y * 10; devMode->dmPaperLength = m_paperSize.y * 10;
devMode->dmPaperSize = DMPAPER_USER;
devMode->dmFields |= DM_PAPERWIDTH; devMode->dmFields |= DM_PAPERWIDTH;
devMode->dmFields |= DM_PAPERLENGTH; devMode->dmFields |= DM_PAPERLENGTH;
} }

6
src/gtk/app.cpp
View File

@@ -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__) #if defined(__WXGTK20__)
// gtk+ 2.0 supports Unicode through UTF-8 strings // gtk+ 2.0 supports Unicode through UTF-8 strings
wxConvCurrent = &wxConvUTF8; wxConvCurrent = &wxConvUTF8;
#elif wxUSE_WCHAR_T #else
if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
#endif
#else #else
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
#endif #endif
@@ -654,7 +657,6 @@ int wxEntryStart( int argc, char *argv[] )
return 0; return 0;
} }
int wxEntryInitGui() int wxEntryInitGui()
{ {
int retValue = 0; int retValue = 0;

2
src/gtk/dcclient.cpp
View File

@@ -1341,7 +1341,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
x = XLOG2DEV(x); x = XLOG2DEV(x);
y = YLOG2DEV(y); 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... */ /* FIXME: the layout engine should probably be abstracted at a higher level in wxDC... */
PangoLayout *layout = pango_layout_new(m_context); PangoLayout *layout = pango_layout_new(m_context);
pango_layout_set_font_description(layout, m_fontdesc); pango_layout_set_font_description(layout, m_fontdesc);

6
src/gtk1/app.cpp
View File

@@ -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__) #if defined(__WXGTK20__)
// gtk+ 2.0 supports Unicode through UTF-8 strings // gtk+ 2.0 supports Unicode through UTF-8 strings
wxConvCurrent = &wxConvUTF8; wxConvCurrent = &wxConvUTF8;
#elif wxUSE_WCHAR_T #else
if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
#endif
#else #else
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
#endif #endif
@@ -654,7 +657,6 @@ int wxEntryStart( int argc, char *argv[] )
return 0; return 0;
} }
int wxEntryInitGui() int wxEntryInitGui()
{ {
int retValue = 0; int retValue = 0;

2
src/gtk1/dcclient.cpp
View File

@@ -1341,7 +1341,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
x = XLOG2DEV(x); x = XLOG2DEV(x);
y = YLOG2DEV(y); 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... */ /* FIXME: the layout engine should probably be abstracted at a higher level in wxDC... */
PangoLayout *layout = pango_layout_new(m_context); PangoLayout *layout = pango_layout_new(m_context);
pango_layout_set_font_description(layout, m_fontdesc); pango_layout_set_font_description(layout, m_fontdesc);

2
src/msw/makefile.b32
View File

@@ -1023,6 +1023,8 @@ $(CFG): makefile.b32
-D__WXMSW__ -D__WXMSW__
-D__WINDOWS__ -D__WINDOWS__
-DWIN32 -DWIN32
-DWINVER=0x0400
-D_WIN32_WINNT=0x0400
$(OPT) $(OPT)
$(DEBUG_FLAGS) $(DEBUG_FLAGS)
$(WIN95FLAG) $(WIN95FLAG)