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

moved GNOME printing code back to wxCore and fixed for --enable-plugins case

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-02-13 21:06:55 +00:00
parent 7f8c0d74d7
commit 2e35017918
8 changed files with 658 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1277
aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

4
autoconf_inc.m4
View File

File diff suppressed because one or more lines are too long

7
build/bakefiles/files.bkl
View File

@@ -856,6 +856,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/fontdlg.cpp src/gtk/fontdlg.cpp
src/gtk/frame.cpp src/gtk/frame.cpp
src/gtk/gauge.cpp src/gtk/gauge.cpp
src/gtk/gnome/gprint.cpp
src/gtk/listbox.cpp src/gtk/listbox.cpp
src/gtk/mdi.cpp src/gtk/mdi.cpp
src/gtk/menu.cpp src/gtk/menu.cpp
@@ -898,6 +899,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk/fontdlg.h wx/gtk/fontdlg.h
wx/gtk/frame.h wx/gtk/frame.h
wx/gtk/gauge.h wx/gtk/gauge.h
wx/gtk/gnome/gprint.h
wx/gtk/listbox.h wx/gtk/listbox.h
wx/gtk/mdi.h wx/gtk/mdi.h
wx/gtk/menu.h wx/gtk/menu.h
@@ -2654,10 +2656,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/unix/sound_sdl.cpp src/unix/sound_sdl.cpp
</set> </set>
<set var="GTK_PRINT_SRC_GNOME" hints="files">
src/gtk/gnome/gprint.cpp
</set>
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- Define sources for specific libraries: --> <!-- Define sources for specific libraries: -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
@@ -2898,7 +2896,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="PLUGIN_ADV_SRC"> <set var="PLUGIN_ADV_SRC">
<if cond="FORMAT=='autoconf' and PLATFORM_UNIX=='1' and USE_PLUGINS=='0'"> <if cond="FORMAT=='autoconf' and PLATFORM_UNIX=='1' and USE_PLUGINS=='0'">
$(UNIX_SOUND_SRC_SDL) $(UNIX_SOUND_SRC_SDL)
$(GTK_PRINT_SRC_GNOME)
</if> </if>
</set> </set>

2
build/bakefiles/plugins_deps.bkl
View File

@@ -9,7 +9,7 @@
<set var="PLUGIN_ADV_EXTRALIBS"> <set var="PLUGIN_ADV_EXTRALIBS">
<if cond="USE_PLUGINS=='0'"> <if cond="USE_PLUGINS=='0'">
$(EXTRALIBS_SDL) $(EXTRALIBS_GNOMEPRINT) $(EXTRALIBS_SDL)
</if> </if>
</set> </set>

6
configure vendored
View File

@@ -39409,7 +39409,7 @@ EXTRALIBS_XML="$EXPAT_LINK"
EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_HTML="$MSPACK_LINK"
EXTRALIBS_ODBC="$ODBC_LINK" EXTRALIBS_ODBC="$ODBC_LINK"
if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK` EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_GNOMEPRINT`
fi fi
if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_OPENGL" = "yes"; then
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
@@ -41322,10 +41322,10 @@ fi
BAKEFILE_BAKEFILE_M4_VERSION="0.1.6" BAKEFILE_BAKEFILE_M4_VERSION="0.1.7"
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.6" BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.7"

2
configure.in
View File

@@ -6287,7 +6287,7 @@ EXTRALIBS_XML="$EXPAT_LINK"
EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_HTML="$MSPACK_LINK"
EXTRALIBS_ODBC="$ODBC_LINK" EXTRALIBS_ODBC="$ODBC_LINK"
if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK` EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_GNOMEPRINT`
fi fi
if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_OPENGL" = "yes"; then
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"

1
samples/html/printing/printing.bkl
View File

@@ -10,7 +10,6 @@
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<wx-lib>adv</wx-lib>
<win32-res>printing.rc</win32-res> <win32-res>printing.rc</win32-res>
</exe> </exe>

1
samples/printing/printing.bkl
View File

@@ -5,7 +5,6 @@
<exe id="printing" template="wx_sample" template_append="wx_append"> <exe id="printing" template="wx_sample" template_append="wx_append">
<sources>printing.cpp</sources> <sources>printing.cpp</sources>
<wx-lib>adv</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>printing.rc</win32-res> <win32-res>printing.rc</win32-res>