Author: fabien
Date: 2010-03-21 15:55:18 -0700 (Sun, 21 Mar 2010)
New Revision: 7312
Log:
Fixed msvc6 compilation was broken. What is the use of visualc now? seems we
should remove that one ...
Modified:
branches/branch-1.3/FL/Fl_PSfile_Device.H
branches/branch-1.3/fluid/alignment_panel.fl
branches/branch-1.3/fluid/alignment_panel.h
branches/branch-1.3/src/Fl_Device.cxx
branches/branch-1.3/src/Fl_GDI_Printer.cxx
branches/branch-1.3/src/Fl_Native_File_Chooser_WIN32.cxx
branches/branch-1.3/src/Fl_Tree_Item.cxx
Modified: branches/branch-1.3/FL/Fl_PSfile_Device.H
===================================================================
--- branches/branch-1.3/FL/Fl_PSfile_Device.H 2010-03-21 22:15:04 UTC (rev
7311)
+++ branches/branch-1.3/FL/Fl_PSfile_Device.H 2010-03-21 22:55:18 UTC (rev
7312)
@@ -29,6 +29,8 @@
#ifndef Fl_PSfile_Device_H
#define Fl_PSfile_Device_H
+
+#define NO_PAGE_FORMATS 30 /* MSVC6 compilation fix */
/**
\brief Sends all graphics to a local PostScript file; same API as Fl_Printer
class.
@@ -136,7 +138,6 @@
FILE *output;
double pw_, ph_;
- static const int NO_PAGE_FORMATS=30;
static const struct page_format page_formats[NO_PAGE_FORMATS];
uchar bg_r, bg_g, bg_b;
Modified: branches/branch-1.3/fluid/alignment_panel.fl
===================================================================
--- branches/branch-1.3/fluid/alignment_panel.fl 2010-03-21 22:15:04 UTC
(rev 7311)
+++ branches/branch-1.3/fluid/alignment_panel.fl 2010-03-21 22:55:18 UTC
(rev 7312)
@@ -49,7 +49,7 @@
decl {extern int show_coredevmenus;} {public local
}
-decl {extern class Fl_Menu_Item *dbmanager_item;} {public local
+decl {extern struct Fl_Menu_Item *dbmanager_item;} {public local
}
Function {make_project_window()} {} {
Modified: branches/branch-1.3/fluid/alignment_panel.h
===================================================================
--- branches/branch-1.3/fluid/alignment_panel.h 2010-03-21 22:15:04 UTC (rev
7311)
+++ branches/branch-1.3/fluid/alignment_panel.h 2010-03-21 22:55:18 UTC (rev
7312)
@@ -36,7 +36,7 @@
extern void redraw_browser();
extern int show_comments;
extern int show_coredevmenus;
-extern class Fl_Menu_Item *dbmanager_item;
+extern struct Fl_Menu_Item *dbmanager_item;
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Preferences.H>
#include <FL/Fl_Tooltip.H>
Modified: branches/branch-1.3/src/Fl_Device.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Device.cxx 2010-03-21 22:15:04 UTC (rev
7311)
+++ branches/branch-1.3/src/Fl_Device.cxx 2010-03-21 22:55:18 UTC (rev
7312)
@@ -142,7 +142,7 @@
while(image_list_) {
struct chain_elt *next = image_list_->next;
if(image_list_->image) delete image_list_->image;
- if (image_list_->data) delete image_list_->data;
+ if (image_list_->data) delete (uchar*) image_list_->data; // msvc6
compilation fix
free(image_list_);
image_list_ = next;
}
Modified: branches/branch-1.3/src/Fl_GDI_Printer.cxx
===================================================================
--- branches/branch-1.3/src/Fl_GDI_Printer.cxx 2010-03-21 22:15:04 UTC (rev
7311)
+++ branches/branch-1.3/src/Fl_GDI_Printer.cxx 2010-03-21 22:55:18 UTC (rev
7312)
@@ -30,7 +30,7 @@
#include <FL/fl_ask.H>
-#include <math.h>
+#include <FL/math.h>
extern HWND fl_window;
Modified: branches/branch-1.3/src/Fl_Native_File_Chooser_WIN32.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Native_File_Chooser_WIN32.cxx 2010-03-21
22:15:04 UTC (rev 7311)
+++ branches/branch-1.3/src/Fl_Native_File_Chooser_WIN32.cxx 2010-03-21
22:55:18 UTC (rev 7312)
@@ -243,7 +243,7 @@
_ofn.lpstrFile = NULL;
}
if ( _ofn.lpstrInitialDir ) {
- delete [] _ofn.lpstrInitialDir;
+ delete [] (TCHAR*) _ofn.lpstrInitialDir; //msvc6 compilation fix
_ofn.lpstrInitialDir = NULL;
}
_ofn.lpstrFilter = NULL; // (deleted elsewhere)
Modified: branches/branch-1.3/src/Fl_Tree_Item.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Tree_Item.cxx 2010-03-21 22:15:04 UTC (rev
7311)
+++ branches/branch-1.3/src/Fl_Tree_Item.cxx 2010-03-21 22:55:18 UTC (rev
7312)
@@ -373,11 +373,13 @@
y |= 1; // force alignment w/dot pattern
fl_line(x1,y,x2,y);
return;
- case FL_TREE_CONNECTOR_DOTTED:
- y |= 1; // force alignment w/dot pattern
- for ( int xx=x1; xx<=x2; xx++ ) {
- if ( !(xx & 1) ) fl_point(xx, y);
- }
+ case FL_TREE_CONNECTOR_DOTTED:
+ {
+ y |= 1; // force alignment w/dot pattern
+ for ( int xx=x1; xx<=x2; xx++ ) {
+ if ( !(xx & 1) ) fl_point(xx, y);
+ }
+ }
return;
case FL_TREE_CONNECTOR_NONE:
return;
@@ -394,12 +396,14 @@
fl_line(x,y1,x,y2);
return;
case FL_TREE_CONNECTOR_DOTTED:
- y1 |= 1; // force alignment w/dot pattern
- y2 |= 1; // force alignment w/dot pattern
- for ( int yy=y1; yy<=y2; yy++ ) {
- if ( yy & 1 ) fl_point(x, yy);
- }
- return;
+ {
+ y1 |= 1; // force alignment w/dot pattern
+ y2 |= 1; // force alignment w/dot pattern
+ for ( int yy=y1; yy<=y2; yy++ ) {
+ if ( yy & 1 ) fl_point(x, yy);
+ }
+ }
+ return;
case FL_TREE_CONNECTOR_NONE:
return;
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
