mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made fluid compile under VicualC6 again. Unfortunatly , the wonderful 'print' addition crashes in fl_color_win32.cxx, line 72.

Browse Source 
Fixed a silly 'I have a great idea - wait - what was it again'-bug that would use a static buffer twice - although without causing any bugs.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4200 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2005-03-28 21:12:54 +00:00
parent 119f78bee0
commit af10e22140
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fluid/fluid.cxx
View File

@ -1083,7 +1083,7 @@ void print_menu_cb(Fl_Widget *, void *) {
EndDoc(dialog.hDC);
fl_gc = save_dc;
fl_window = save_window;
fl_window = save_win;
fl_pop_clip();
// Free the print DC and return...

2
src/Fl_Preferences.cxx
View File

@ -883,7 +883,7 @@ Fl_Preferences::Node *Fl_Preferences::Node::addChild( const char *path )
{
sprintf( nameBuffer, "%s/%s", path_, path );
char *name = strdup( nameBuffer );
Node *nd = find( nameBuffer );
Node *nd = find( name );
free( name );
dirty_ = 1;
return nd;

4
visualc/fltk.lib.dsp
View File

@ -407,6 +407,10 @@ SOURCE=..\src\Fl_Progress.cxx
# End Source File
# Begin Source File
SOURCE=..\src\fl_read_image.cxx
# End Source File
# Begin Source File
SOURCE=..\src\fl_rect.cxx
# End Source File
# Begin Source File

16
visualc/fluid.dsp
View File

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD CPP /nologo /MD /GX /Ot /Op /Ob2 /I "." /I ".." /I "../png" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# SUBTRACT CPP /Os
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD CPP /nologo /MDd /Gm /GX /ZI /Od /I "." /I ".." /I "../png" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRA_LEAN" /D "WIN32_EXTRA_LEAN" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -108,6 +108,10 @@ SOURCE=..\fluid\code.cxx
# End Source File
# Begin Source File
SOURCE=..\fluid\CodeEditor.cxx
# End Source File
# Begin Source File
SOURCE=..\fluid\factory.cxx
# End Source File
# Begin Source File
@ -152,15 +156,15 @@ SOURCE=..\fluid\function_panel.cxx
# End Source File
# Begin Source File
SOURCE=..\fluid\template_panel.cxx
# End Source File
# Begin Source File
SOURCE=..\fluid\undo.cxx
# End Source File
# Begin Source File
SOURCE=..\fluid\widget_panel.cxx
# End Source File
# Begin Source File
SOURCE=..\fluid\CodeEditor.cxx
# End Source File
# End Target
# End Project