Made sample compile after removal of wxPrintSetupDialog.

    Tweak makefile to work with GNOME printing.

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

diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index 1f49b4ecfca63fa8bb92107e21b858f1a2ceb363..8b58a518d605eb51634d40f2d5fe4a97b3126f4b 100644 (file)
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -30,6 +30,8 @@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_SDL = @EXTRALIBS_SDL@
+EXTRALIBS_GNOMEPRINT = @EXTRALIBS_GNOMEPRINT@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -51,6 +53,8 @@ PRINTING_OBJECTS =  \
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = \
+@COND_USE_PLUGINS_0@   $(EXTRALIBS_SDL) $(EXTRALIBS_GNOMEPRINT)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -90,6 +94,9 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_0___WXLIB_ADV_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
 @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_printing_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -138,7 +145,7 @@ distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
-       $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
+       $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
        $(__printing___mac_rezcmd)
        $(__printing___mac_setfilecmd)
        $(__printing___os2_emxbindcmd)

diff --git a/samples/html/printing/printing.bkl b/samples/html/printing/printing.bkl
index 0d665c6315131c760434b38190e8ccd89a7d82a5..37e7f0ad1952048d9ed2901925939ae1c9214075 100644 (file)
--- a/samples/html/printing/printing.bkl
+++ b/samples/html/printing/printing.bkl
@@ -10,6 +10,7 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
+        <wx-lib>adv</wx-lib>
         <win32-res>printing.rc</win32-res>
     </exe>
 

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index 6a0b4199326345030a4644f7d502e9339c888fae..6ce878f0a5364f492f9d2a9ccc320a6b358ad00c 100644 (file)
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -54,7 +54,6 @@ class MyFrame : public wxFrame
         void OnQuit(wxCommandEvent& event);
         void OnAbout(wxCommandEvent& event);
 
-        void OnPrintSetup(wxCommandEvent& event);
         void OnPageSetup(wxCommandEvent& event);
         void OnPrint(wxCommandEvent& event);
         void OnPreview(wxCommandEvent& event);
@@ -85,7 +84,6 @@ enum
     Minimal_Print,
     Minimal_Preview,
     Minimal_PageSetup,
-    Minimal_PrintSetup,
     Minimal_Open,
     Minimal_PrintSmall,
     Minimal_PrintNormal,
@@ -106,7 +104,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Print, MyFrame::OnPrint)
     EVT_MENU(Minimal_Preview, MyFrame::OnPreview)
     EVT_MENU(Minimal_PageSetup, MyFrame::OnPageSetup)
-    EVT_MENU(Minimal_PrintSetup, MyFrame::OnPrintSetup)
     EVT_MENU(Minimal_Open, MyFrame::OnOpen)
     EVT_MENU(Minimal_PrintSmall, MyFrame::OnPrintSmall)
     EVT_MENU(Minimal_PrintNormal, MyFrame::OnPrintNormal)
@@ -128,6 +125,7 @@ IMPLEMENT_APP(MyApp)
 // the application class
 // ----------------------------------------------------------------------------
 // `Main program' equivalent: the program execution "starts" here
+
 bool MyApp::OnInit()
 {
 #if wxUSE_LIBPNG
@@ -169,7 +167,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFile->Append(Minimal_Open, _("Open...\tCtrl-O"));
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_PageSetup, _("Page Setup"));
-    menuFile->Append(Minimal_PrintSetup, _("Printer Setup"));
     menuFile->Append(Minimal_Print, _("Print..."));
     menuFile->Append(Minimal_Preview, _("Preview..."));
     menuFile->AppendSeparator();
@@ -233,12 +230,6 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 
 
-void MyFrame::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
-{
-    m_Prn -> PrinterSetup();
-}
-
-
 void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 {
     m_Prn -> PageSetup();