From: <gof...@us...> - 2007-11-23 15:45:16
|
Revision: 4287 http://octave.svn.sourceforge.net/octave/?rev=4287&view=rev Author: goffioul Date: 2007-11-23 07:45:17 -0800 (Fri, 23 Nov 2007) Log Message: ----------- re-enable toolbar in console mode + use libtool-compiled libgd Modified Paths: -------------- trunk/octave-forge/admin/Windows/msvc/libs/gnuplot-4.2.2.diff Modified: trunk/octave-forge/admin/Windows/msvc/libs/gnuplot-4.2.2.diff =================================================================== --- trunk/octave-forge/admin/Windows/msvc/libs/gnuplot-4.2.2.diff 2007-11-23 05:51:53 UTC (rev 4286) +++ trunk/octave-forge/admin/Windows/msvc/libs/gnuplot-4.2.2.diff 2007-11-23 15:45:17 UTC (rev 4287) @@ -1,6 +1,6 @@ diff -ur gnuplot-4.2.2/config/makefile.nt gnuplot-4.2.2-new/config/makefile.nt --- gnuplot-4.2.2/config/makefile.nt Fri Aug 11 18:35:29 2006 -+++ gnuplot-4.2.2-new/config/makefile.nt Wed Nov 7 15:30:28 2007 ++++ gnuplot-4.2.2-new/config/makefile.nt Fri Nov 23 15:36:40 2007 @@ -31,8 +31,17 @@ # where to place gnuplot.gih helpfile HELPFILE = wgnuplot.hlp @@ -102,11 +102,12 @@ echo advapi32.lib >> linkopt1.msw echo shell32.lib >> linkopt1.msw - echo pdflib.lib >> linkopt1.msw +- echo bgd.lib >> linkopt1.msw + echo ole32.lib >> linkopt1.msw + echo oleaut32.lib >> linkopt1.msw + echo comctl32.lib >> linkopt1.msw +# echo pdflib.lib >> linkopt1.msw - echo bgd.lib >> linkopt1.msw ++ echo gd.lib >> linkopt1.msw + echo wxmsw28.lib >> linkopt1.msw + echo wxtiff.lib >> linkopt1.msw + echo jpeg.lib >> linkopt1.msw @@ -220,7 +221,7 @@ +$(ALL_CONSOLE_OBJS) +kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib +advapi32.lib shell32.lib ole32.lib oleaut32.lib comctl32.lib -+bgd.lib wxmsw28.lib wxtiff.lib ++gd.lib wxmsw28.lib wxtiff.lib +jpeg.lib png.lib +glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib +cairo.lib pango-1.0.lib pangocairo-1.0.lib @@ -267,7 +268,7 @@ + xcopy /Y ..\demo $(DESTDIR)\share\gnuplot\demo diff -ur gnuplot-4.2.2/src/command.c gnuplot-4.2.2-new/src/command.c --- gnuplot-4.2.2/src/command.c Fri Aug 3 04:55:38 2007 -+++ gnuplot-4.2.2-new/src/command.c Wed Nov 7 13:31:49 2007 ++++ gnuplot-4.2.2-new/src/command.c Fri Nov 23 15:36:08 2007 @@ -2686,6 +2686,9 @@ if (last >= 0) { if (gp_input_line[last] == '\n') { /* remove any newline */ @@ -280,7 +281,7 @@ --last; diff -ur gnuplot-4.2.2/src/plot.c gnuplot-4.2.2-new/src/plot.c --- gnuplot-4.2.2/src/plot.c Mon Jun 18 03:31:48 2007 -+++ gnuplot-4.2.2-new/src/plot.c Wed Nov 7 13:31:49 2007 ++++ gnuplot-4.2.2-new/src/plot.c Fri Nov 23 15:36:08 2007 @@ -480,7 +480,7 @@ else interactive = FALSE; @@ -292,7 +293,7 @@ interactive = isatty(fileno(stdin)); diff -ur gnuplot-4.2.2/src/readline.c gnuplot-4.2.2-new/src/readline.c --- gnuplot-4.2.2/src/readline.c Fri Apr 28 18:54:03 2006 -+++ gnuplot-4.2.2-new/src/readline.c Wed Nov 7 13:31:49 2007 ++++ gnuplot-4.2.2-new/src/readline.c Fri Nov 23 15:36:08 2007 @@ -259,7 +259,12 @@ # include "win/winmain.h" # define TEXTUSER 0xf1 @@ -334,7 +335,7 @@ static char diff -ur gnuplot-4.2.2/src/term.c gnuplot-4.2.2-new/src/term.c --- gnuplot-4.2.2/src/term.c Thu Mar 22 06:05:07 2007 -+++ gnuplot-4.2.2-new/src/term.c Wed Nov 7 13:31:50 2007 ++++ gnuplot-4.2.2-new/src/term.c Fri Nov 23 15:36:08 2007 @@ -101,6 +101,7 @@ void close_printer __PROTO((FILE * outfile)); # ifdef __MSC__ @@ -345,7 +346,7 @@ # endif /* MSC */ diff -ur gnuplot-4.2.2/src/version.c gnuplot-4.2.2-new/src/version.c --- gnuplot-4.2.2/src/version.c Fri Aug 31 08:26:20 2007 -+++ gnuplot-4.2.2-new/src/version.c Wed Nov 7 13:31:50 2007 ++++ gnuplot-4.2.2-new/src/version.c Fri Nov 23 15:36:08 2007 @@ -40,7 +40,7 @@ @@ -357,7 +358,7 @@ diff -ur gnuplot-4.2.2/src/win/wgnuplib.h gnuplot-4.2.2-new/src/win/wgnuplib.h --- gnuplot-4.2.2/src/win/wgnuplib.h Sun Mar 5 02:15:56 2006 -+++ gnuplot-4.2.2-new/src/win/wgnuplib.h Wed Nov 7 13:31:50 2007 ++++ gnuplot-4.2.2-new/src/win/wgnuplib.h Fri Nov 23 15:36:08 2007 @@ -45,7 +45,9 @@ #include <windows.h> @@ -371,7 +372,7 @@ /* HBB 19990506: The following used to be #ifdef __DLL__. diff -ur gnuplot-4.2.2/src/win/winmain.c gnuplot-4.2.2-new/src/win/winmain.c --- gnuplot-4.2.2/src/win/winmain.c Thu Mar 22 06:08:26 2007 -+++ gnuplot-4.2.2-new/src/win/winmain.c Wed Nov 7 15:19:29 2007 ++++ gnuplot-4.2.2-new/src/win/winmain.c Fri Nov 23 15:36:08 2007 @@ -62,6 +62,7 @@ #include <string.h> #include <stdarg.h> @@ -561,7 +562,7 @@ * (formerly in win.trm) diff -ur gnuplot-4.2.2/src/win/winmain.h gnuplot-4.2.2-new/src/win/winmain.h --- gnuplot-4.2.2/src/win/winmain.h Sun Jul 16 04:50:56 2006 -+++ gnuplot-4.2.2-new/src/win/winmain.h Wed Nov 7 13:31:50 2007 ++++ gnuplot-4.2.2-new/src/win/winmain.h Fri Nov 23 15:36:08 2007 @@ -55,6 +55,7 @@ extern LPSTR winhelpname; @@ -572,7 +573,7 @@ void screen_dump __PROTO((void)); diff -ur gnuplot-4.2.2/src/win/wtext.h gnuplot-4.2.2-new/src/win/wtext.h --- gnuplot-4.2.2/src/win/wtext.h Thu Jul 1 19:10:11 2004 -+++ gnuplot-4.2.2-new/src/win/wtext.h Wed Nov 7 13:31:50 2007 ++++ gnuplot-4.2.2-new/src/win/wtext.h Fri Nov 23 15:36:08 2007 @@ -40,6 +40,8 @@ /* redefine functions that can talk to tty devices, to use * implementation in winmain.c/wgnuplot.dll */ @@ -594,7 +595,7 @@ +#endif /* CONSOLE */ diff -ur gnuplot-4.2.2/src/wxterminal/gp_cairo.c gnuplot-4.2.2-new/src/wxterminal/gp_cairo.c --- gnuplot-4.2.2/src/wxterminal/gp_cairo.c Sun Aug 26 06:54:28 2007 -+++ gnuplot-4.2.2-new/src/wxterminal/gp_cairo.c Wed Nov 7 13:31:50 2007 ++++ gnuplot-4.2.2-new/src/wxterminal/gp_cairo.c Fri Nov 23 15:36:08 2007 @@ -78,6 +78,10 @@ #include <pango/pangocairo.h> #include <glib.h> @@ -624,28 +625,8 @@ /* free the layout object */ diff -ur gnuplot-4.2.2/src/wxterminal/wxt_gui.cpp gnuplot-4.2.2-new/src/wxterminal/wxt_gui.cpp --- gnuplot-4.2.2/src/wxterminal/wxt_gui.cpp Thu May 24 06:45:30 2007 -+++ gnuplot-4.2.2-new/src/wxterminal/wxt_gui.cpp Wed Nov 7 13:31:50 2007 -@@ -129,6 +129,7 @@ - EVT_COMMAND( wxID_ANY, wxExitLoopEvent, wxtApp::OnExitLoop ) - EVT_CLOSE( wxtFrame::OnClose ) - EVT_SIZE( wxtFrame::OnSize ) -+#ifndef OCTAVE_BUILD - EVT_TOOL( Toolbar_CopyToClipboard, wxtFrame::OnCopy ) - #ifdef USE_MOUSE - EVT_TOOL( Toolbar_Replot, wxtFrame::OnReplot ) -@@ -139,6 +140,7 @@ - #endif /*USE_MOUSE*/ - EVT_TOOL( Toolbar_Config, wxtFrame::OnConfig ) - EVT_TOOL( Toolbar_Help, wxtFrame::OnHelp ) -+#endif - END_EVENT_TABLE() - - BEGIN_EVENT_TABLE( wxtPanel, wxPanel ) -@@ -324,10 +326,11 @@ - CreateStatusBar(); - SetStatusText( wxT("") ); - -+#ifndef OCTAVE_BUILD ++++ gnuplot-4.2.2-new/src/wxterminal/wxt_gui.cpp Fri Nov 23 15:37:47 2007 +@@ -327,7 +327,7 @@ /* set up the toolbar */ wxToolBar * toolbar = CreateToolBar(); /* With wxMSW, default toolbar size is only 16x15. */ @@ -654,23 +635,15 @@ toolbar->AddTool(Toolbar_CopyToClipboard, wxT("Copy"), *(toolBarBitmaps[0]), wxT("Copy the plot to clipboard")); -@@ -350,6 +353,7 @@ - toolbar->AddTool(Toolbar_Help, wxT("Help"), - *(toolBarBitmaps[7]), wxT("Open help dialog")); - toolbar->Realize(); -+#endif +@@ -358,6 +358,7 @@ - FPRINTF((stderr,"wxtFrame constructor 2\n")); - -@@ -358,6 +362,7 @@ - /* setting minimum height and width for the window */ SetSizeHints(100, 100); + OnSize( wxSizeEvent( this->GetSize() ) ); FPRINTF((stderr,"wxtFrame constructor 3\n")); } -@@ -488,7 +493,7 @@ +@@ -488,7 +489,7 @@ /* panel constructor * Note : under Windows, wxDefaultPosition makes the panel hide the toolbar */ wxtPanel::wxtPanel( wxWindow *parent, wxWindowID id, const wxSize& size ) @@ -679,7 +652,7 @@ { FPRINTF((stderr,"panel constructor\n")); -@@ -1340,6 +1345,7 @@ +@@ -1340,6 +1341,7 @@ #ifdef __WXMSW__ /* the following is done in wxEntry() with wxMSW only */ @@ -689,7 +662,7 @@ #endif diff -ur gnuplot-4.2.2/term/post.trm gnuplot-4.2.2-new/term/post.trm --- gnuplot-4.2.2/term/post.trm Mon Jun 18 03:31:49 2007 -+++ gnuplot-4.2.2-new/term/post.trm Wed Nov 7 13:31:50 2007 ++++ gnuplot-4.2.2-new/term/post.trm Fri Nov 23 15:36:08 2007 @@ -3122,9 +3122,9 @@ # if defined(_Windows) /* retrieve prologues path relatively to gnuplot executable, @@ -704,7 +677,7 @@ strcat(ps_prologue_dir, GNUPLOT_PS_DIR); diff -ur gnuplot-4.2.2/term/win.trm gnuplot-4.2.2-new/term/win.trm --- gnuplot-4.2.2/term/win.trm Mon Jul 30 06:17:21 2007 -+++ gnuplot-4.2.2-new/term/win.trm Wed Nov 7 13:31:50 2007 ++++ gnuplot-4.2.2-new/term/win.trm Fri Nov 23 15:36:08 2007 @@ -86,6 +86,7 @@ TERM_PUBLIC void WIN_set_cursor __PROTO((int, int, int)); TERM_PUBLIC void WIN_put_tmptext __PROTO((int, const char str[])); @@ -744,7 +717,7 @@ , WIN_make_palette, 0 /* previous_palette */, diff -ur gnuplot-4.2.2/term/wxt.trm gnuplot-4.2.2-new/term/wxt.trm --- gnuplot-4.2.2/term/wxt.trm Fri Sep 15 16:09:36 2006 -+++ gnuplot-4.2.2-new/term/wxt.trm Wed Nov 7 13:31:50 2007 ++++ gnuplot-4.2.2-new/term/wxt.trm Fri Nov 23 15:36:08 2007 @@ -59,12 +59,20 @@ /* terminal state, defined extern in wxt_term.h */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |