Author: matt
Date: 2012-06-10 05:25:17 -0700 (Sun, 10 Jun 2012)
New Revision: 9583
Log:
Classified all FIXME: 123 entries into FLTK1, 2, or 3 issues.
Modified:
branches/branch-3.0/fluid1/Fl_Window_Type.cxx
branches/branch-3.0/include/FL/Fl.H
branches/branch-3.0/include/FL/Fl_Browser_.H
branches/branch-3.0/include/FL/Fl_Button.H
branches/branch-3.0/include/FL/Fl_Group.H
branches/branch-3.0/include/FL/Fl_Help_View.H
branches/branch-3.0/include/FL/Fl_Image.H
branches/branch-3.0/include/FL/Fl_Input_Choice.H
branches/branch-3.0/include/FL/Fl_PNG_Image.H
branches/branch-3.0/include/FL/Fl_PNM_Image.H
branches/branch-3.0/include/FL/Fl_Printer.H
branches/branch-3.0/include/FL/Fl_Scroll.H
branches/branch-3.0/include/FL/Fl_Shared_Image.H
branches/branch-3.0/include/FL/Fl_Table.H
branches/branch-3.0/include/FL/Fl_Table_Row.H
branches/branch-3.0/include/FL/Fl_Text_Display.H
branches/branch-3.0/include/FL/Fl_Tiled_Image.H
branches/branch-3.0/include/FL/Fl_Tooltip.H
branches/branch-3.0/include/FL/Fl_Tree.H
branches/branch-3.0/include/FL/Fl_Tree_Item.H
branches/branch-3.0/include/FL/Fl_Tree_Item_Array.H
branches/branch-3.0/include/FL/Fl_Tree_Prefs.H
branches/branch-3.0/include/FL/Fl_Valuator.H
branches/branch-3.0/include/FL/Fl_Widget.H
branches/branch-3.0/include/FL/Fl_XBM_Image.H
branches/branch-3.0/include/FL/Fl_XPM_Image.H
branches/branch-3.0/include/FL/filename.H
branches/branch-3.0/include/FL/fl_ask.H
branches/branch-3.0/include/FL/fl_draw.H
branches/branch-3.0/include/FL/gl.h
branches/branch-3.0/include/FL/gl_draw.H
branches/branch-3.0/include/FL/glut.H
branches/branch-3.0/include/FL/win32.H
branches/branch-3.0/include/FL/x.H
branches/branch-3.0/include/fltk/Color.h
branches/branch-3.0/include/fltk/Flags.h
branches/branch-3.0/include/fltk/Group.h
branches/branch-3.0/include/fltk/Rectangle.h
branches/branch-3.0/include/fltk/Style.h
branches/branch-3.0/include/fltk/Valuator.h
branches/branch-3.0/include/fltk/Widget.h
branches/branch-3.0/include/fltk/Window.h
branches/branch-3.0/include/fltk/run.h
branches/branch-3.0/include/fltk3gl/gl.h
branches/branch-3.0/test/cube.cxx
branches/branch-3.0/test1/file_chooser.cxx
Modified: branches/branch-3.0/fluid1/Fl_Window_Type.cxx
===================================================================
--- branches/branch-3.0/fluid1/Fl_Window_Type.cxx 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/fluid1/Fl_Window_Type.cxx 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -319,7 +319,7 @@
// Read an image of the overlay window
uchar *Overlay_Window::read_image(int &ww, int &hh) {
return 0L;
-#if 0 // FIXME: 123 - no offscreen rendering yet
+#if 0 // FIXME: 123-1 - no offscreen rendering yet
// Create an off-screen buffer for the window...
//main_window->make_current();
make_current();
@@ -432,7 +432,7 @@
w->resizable(p);
}
- // w->image(Fl::scheme_bg_); // FIXME: 123
+ // w->image(Fl::scheme_bg_); // FIXME: 123-1
w->size_range(gridx, gridy, Fl::w(), Fl::h(), gridx, gridy, 0);
}
Modified: branches/branch-3.0/include/FL/Fl.H
===================================================================
--- branches/branch-3.0/include/FL/Fl.H 2012-06-10 11:10:24 UTC (rev 9582)
+++ branches/branch-3.0/include/FL/Fl.H 2012-06-10 12:25:17 UTC (rev 9583)
@@ -63,7 +63,7 @@
public: // should be private!
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
// these have not been wrapped yet!
static void (*idle)();
static int get_awake_handler_(Fl_Awake_Handler &h, void *&d) {}
@@ -75,7 +75,7 @@
static void clear_widget_pointer(Fl_Widget const *w);
#endif
- static void fatal(const char* format, ...) { /* FIXME: 123 */ }
+ static void fatal(const char* format, ...) { /* FIXME: 123-1 */ }
static void damage(int d) {
fltk3::damage(d);
@@ -445,7 +445,7 @@
}
static Fl_Event_Dispatch event_dispatch() {
- return 0L; // FIXME: 123 - (fltk3::EventDispatch)fltk3::event_dispatch();
+ return 0L; // FIXME: 123-1 - (fltk3::EventDispatch)fltk3::event_dispatch();
}
static void copy(const char* stuff, int len, int destination = 0) {
Modified: branches/branch-3.0/include/FL/Fl_Browser_.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Browser_.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Browser_.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -134,9 +134,9 @@
FLTK3_WIDGET_VCALLS(Fl_Browser_, Browser_)
- // FIXME: 123 Fl_Scrollbar scrollbar;
+ // FIXME: 123-1 Fl_Scrollbar scrollbar;
- // FIXME: 123 Fl_Scrollbar hscrollbar;
+ // FIXME: 123-1 Fl_Scrollbar hscrollbar;
int select(void *item,int val=1,int docallbacks=0) {
return ((fltk3::Browser_*)_p)->select(item, val, docallbacks);
Modified: branches/branch-3.0/include/FL/Fl_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Button.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/Fl_Button.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -36,7 +36,7 @@
#define FL_RADIO_BUTTON (FL_RESERVED_TYPE+2)
#define FL_HIDDEN_BUTTON 3
-// FIXME: 123 extern FL_EXPORT Fl_Shortcut fl_old_shortcut(const char*);
+// FIXME: 123-1 extern FL_EXPORT Fl_Shortcut fl_old_shortcut(const char*);
class Fl_Widget_Tracker;
Modified: branches/branch-3.0/include/FL/Fl_Group.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Group.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/Fl_Group.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -104,7 +104,7 @@
return ((fltk3::Group*)_p)->find(*(fltk3::_1to3_widget((Fl_Widget*)&o)));
}
- // FIXME: 123 - can't traslate easily! Fl_Widget* const* array() const;
+ // FIXME: 123-1 - can't traslate easily! Fl_Widget* const* array() const;
void add(Fl_Widget &o) {
((fltk3::Group*)_p)->add(fltk3::_1to3_widget(&o));
Modified: branches/branch-3.0/include/FL/Fl_Help_View.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Help_View.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Help_View.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -47,7 +47,7 @@
FLTK3_WRAPPER_INTERFACE_END()
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
struct Fl_Help_Block {
const char *start, // Start of text
Modified: branches/branch-3.0/include/FL/Fl_Image.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Image.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/Fl_Image.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -80,7 +80,7 @@
((fltk3::Image*)_p)->draw_empty(X, Y);
}
- // FIXME: 123 - Fl_Label not wrapped!
+ // FIXME: 123-1 - Fl_Label not wrapped!
static void labeltype(const Fl_Label *lo, int lx, int ly, int lw, int lh,
Fl_Align la) {
fltk3::Image::labeltype((fltk3::Label*)lo, lx, ly, lw, lh,
fltk3::_1to3_align(la));
}
@@ -92,7 +92,7 @@
public:
virtual Fl_Image* copy(int w, int h) {
- // FIXME: 123
+ // FIXME: 123-1
fltk3::Image* ret = 0;
if ( pVCalls & pVCallImageCopyWH ) {
ret = ((fltk3::Image_I*)_p)->copy(w, h);
@@ -109,7 +109,7 @@
Fl_Image() { }
Fl_Image(fltk3::Image *img) {
- // FIXME: 123
+ // FIXME: 123-1
_p = img;
_p->wrapper(this);
}
@@ -139,13 +139,13 @@
}
Fl_Image(int W, int H, int D) {
- // FIXME: 123
+ // FIXME: 123-1
_p = new fltk3::Image(W, H, D);
_p->wrapper(this);
}
Fl_Image *copy() {
- // FIXME: 123
+ // FIXME: 123-1
return new Fl_Image( ((fltk3::Image*)_p)->copy() );
}
Modified: branches/branch-3.0/include/FL/Fl_Input_Choice.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Input_Choice.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Input_Choice.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -80,7 +80,7 @@
return fltk3::_3to1_boxtype( ((fltk3::InputChoice*)_p)->down_box() );
}
- // FIXME: 123
+ // FIXME: 123-1
void down_box(Fl_Boxtype b) {
((fltk3::InputChoice*)_p)->down_box( fltk3::_1to3_boxtype(b) );
}
@@ -129,12 +129,12 @@
((fltk3::InputChoice*)_p)->value(val);
}
- // FIXME: 123
+ // FIXME: 123-1
Fl_Menu_Button *menubutton() {
return (Fl_Menu_Button*)fltk3::_3to1_widget(
((fltk3::InputChoice*)_p)->menubutton() );
}
- // FIXME: 123
+ // FIXME: 123-1
Fl_Input *input() {
return (Fl_Input*)fltk3::_3to1_widget( ((fltk3::InputChoice*)_p)->input()
);
}
Modified: branches/branch-3.0/include/FL/Fl_PNG_Image.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_PNG_Image.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_PNG_Image.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -42,13 +42,13 @@
FLTK3_IMAGE_VCALLS(Fl_PNG_Image, PNGImage)
Fl_PNG_Image(const char* filename) {
- // FIXME: 123 PngImage_I
+ // FIXME: 123-1 PngImage_I
_p = new fltk3::PNGImage(filename);
_p->wrapper(this);
}
Fl_PNG_Image (const char *name_png, const unsigned char *buffer, int
datasize) {
- // FIXME: 123 PngImage_I
+ // FIXME: 123-1 PngImage_I
_p = new fltk3::PNGImage(name_png, buffer, datasize);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_PNM_Image.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_PNM_Image.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_PNM_Image.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -44,7 +44,7 @@
FLTK3_IMAGE_VCALLS(Fl_PNM_Image, PNMImage)
Fl_PNM_Image(const char* filename) {
- // FIXME: 123 PNMImage_I
+ // FIXME: 123-1 PNMImage_I
_p = new fltk3::PNMImage(filename);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Printer.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Printer.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/Fl_Printer.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -42,7 +42,7 @@
}
#if 0 // can't wrap!
- // FIXME: 123
+ // FIXME: 123-1
static const char *dialog_title;
static const char *dialog_printer;
static const char *dialog_range;
Modified: branches/branch-3.0/include/FL/Fl_Scroll.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Scroll.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/Fl_Scroll.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -50,9 +50,9 @@
FLTK3_WIDGET_VCALLS(Fl_Scroll, ScrollGroup)
- // FIXME: 123 - Fl_Scrollbar scrollbar;
+ // FIXME: 123-1 - Fl_Scrollbar scrollbar;
- // FIXME: 123 - Fl_Scrollbar hscrollbar;
+ // FIXME: 123-1 - Fl_Scrollbar hscrollbar;
Fl_Scroll() {}
Modified: branches/branch-3.0/include/FL/Fl_Shared_Image.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Shared_Image.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Shared_Image.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -47,7 +47,7 @@
protected:
#if 0
- // FIXME: 123
+ // FIXME: 123-1
static Fl_Shared_Image **images_; // Shared images
static int num_images_; // Number of shared images
static int alloc_images_; // Allocated shared images
@@ -75,7 +75,7 @@
FLTK3_IMAGE_VCALLS(Fl_Shared_Image, SharedImage)
#if 0
- // FIXME: 123
+ // FIXME: 123-1
/** Returns the filename of the shared image */
const char *name() { return name_; }
/** Returns the number of references of this shared image. When reference is
below 1, the image is deleted. */
@@ -87,7 +87,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
void reload();
Fl_Image *copy() { return copy(w(), h()); }
@@ -123,13 +123,13 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
static Fl_Shared_Image **images();
static int num_images();
#endif
#if 0 // TODO: 123 - can we port this?
- // FIXME: 123
+ // FIXME: 123-1
static void add_handler(Fl_Shared_Handler f) {
fltk3::SharedImage::add_handler((fltk3::SharedHandler)f);
}
Modified: branches/branch-3.0/include/FL/Fl_Table.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Table.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/Fl_Table.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -77,7 +77,7 @@
RESIZE_ROW_BELOW = 4
};
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
void recalc_dimensions();
void table_resized();
void table_scrolled();
@@ -263,7 +263,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
inline void top_row(int row) { // set/get top row (deprecated)
inline int top_row() {
int is_selected(int r, int c); // selected cell
@@ -300,7 +300,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
void do_callback(TableContext context, int row, int col) {
#endif
Modified: branches/branch-3.0/include/FL/Fl_Table_Row.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Table_Row.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Table_Row.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -51,7 +51,7 @@
SELECT_MULTI // multiple row selection (default)
};
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
protected:
int handle(int event);
int find_cell(TableContext context, // find cell's x/y/w/h given r/c
@@ -69,7 +69,7 @@
_p->wrapper(this);
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
/**
The destructor for the Fl_Table_Row.
Destroys the table and its associated widgets.
@@ -100,7 +100,7 @@
return ((fltk3::TableRow*)_p)->row_selected(row);
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
/**
Changes the selection state for 'row', depending on the value
of 'flag'. 0=deselected, 1=select, 2=toggle existing state.
Modified: branches/branch-3.0/include/FL/Fl_Text_Display.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Text_Display.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Text_Display.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -405,8 +405,8 @@
}
- // FIXME: 123 - static void h_scrollbar_cb(Fl_Scrollbar* w, Fl_Text_Display*
d);
- // FIXME: 123 - static void v_scrollbar_cb( Fl_Scrollbar* w,
Fl_Text_Display* d) {
+ // FIXME: 123-1 - static void h_scrollbar_cb(Fl_Scrollbar* w,
Fl_Text_Display* d);
+ // FIXME: 123-1 - static void v_scrollbar_cb( Fl_Scrollbar* w,
Fl_Text_Display* d) {
void update_v_scrollbar() {
((fltk3::TextDisplay_I*)_p)->update_v_scrollbar();
Modified: branches/branch-3.0/include/FL/Fl_Tiled_Image.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tiled_Image.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Tiled_Image.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -42,7 +42,7 @@
FLTK3_IMAGE_VCALLS(Fl_Tiled_Image, TiledImage)
Fl_Tiled_Image(Fl_Image *i, int W = 0, int H = 0) {
- // FIXME: 123 TiledImage_I
+ // FIXME: 123-1 TiledImage_I
_p = new fltk3::TiledImage(fltk3::_1to3_image(i), W, H);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Tooltip.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tooltip.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/Fl_Tooltip.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -37,13 +37,13 @@
public:
- // FIXME: 123 - static void (*enter)(Fl_Widget* w);
+ // FIXME: 123-1 - static void (*enter)(Fl_Widget* w);
static void enter_area(Fl_Widget* w, int X, int Y, int W, int H, const char*
tip) {
fltk3::Tooltip::enter_area(fltk3::_1to3_widget(w), X, Y, W, H, tip);
}
- // FIXME: 123 - static void (*exit)(Fl_Widget *w);
+ // FIXME: 123-1 - static void (*exit)(Fl_Widget *w);
static Fl_Widget* current() {
return fltk3::_3to1_widget( fltk3::Tooltip::current() );
Modified: branches/branch-3.0/include/FL/Fl_Tree.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tree.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/Fl_Tree.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -67,7 +67,7 @@
public:
#if 0
- // FIXME: 123
+ // FIXME: 123-1
Fl_Tree_Item_Reselect_Mode item_reselect_mode() const {
return _itemReselectMode;
}
Modified: branches/branch-3.0/include/FL/Fl_Tree_Item.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tree_Item.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Tree_Item.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -58,7 +58,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
~Fl_Tree_Item(); // DTOR
Fl_Tree_Item(const Fl_Tree_Item *o); // COPY CTOR
@@ -128,7 +128,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
/// Return the number of children this item has.
int children() const {
return(_children.total());
@@ -180,7 +180,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
Fl_Tree_Item *next_displayed(Fl_Tree_Prefs &prefs);
Fl_Tree_Item *prev_displayed(Fl_Tree_Prefs &prefs);
#endif
@@ -194,7 +194,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
/// Set the parent for this item.
/// Should only be used by Fl_Tree's internals.
///
@@ -320,7 +320,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
//////////////////
// Events
//////////////////
Modified: branches/branch-3.0/include/FL/Fl_Tree_Item_Array.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tree_Item_Array.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Tree_Item_Array.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -46,7 +46,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
~Fl_Tree_Item_Array(); // DTOR
Fl_Tree_Item_Array(const Fl_Tree_Item_Array *o); // COPY CTOR
/// Return the item and index \p i.
Modified: branches/branch-3.0/include/FL/Fl_Tree_Prefs.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tree_Prefs.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Tree_Prefs.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -59,7 +59,7 @@
}
#if 0
- // FIXME: 123
+ // FIXME: 123-1
////////////////////////////
// Labels
Modified: branches/branch-3.0/include/FL/Fl_Valuator.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Valuator.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_Valuator.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -75,7 +75,7 @@
((fltk3::Valuator_I*)_p)->handle_release();
}
- // FIXME: 123 - this method was virtual
+ // FIXME: 123-1 - this method was virtual
void value_damage() {
((fltk3::Valuator_I*)_p)->value_damage();
}
@@ -140,7 +140,7 @@
return ((fltk3::Valuator_I*)_p)->value(v);
}
- // FIXME: 123 - this method was virtual
+ // FIXME: 123-1 - this method was virtual
int format(char *f) {
return ((fltk3::Valuator_I*)_p)->format(f);
}
Modified: branches/branch-3.0/include/FL/Fl_Widget.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Widget.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/Fl_Widget.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -60,7 +60,7 @@
typedef void (Fl_Callback1)(Fl_Widget*, long);
-#if 0 // FIXME: 123 - not sure how to translate this yet
+#if 0 // FIXME: 123-1 - not sure how to translate this yet
struct FL_EXPORT Fl_Label {
const char* value;
Fl_Image* image;
Modified: branches/branch-3.0/include/FL/Fl_XBM_Image.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_XBM_Image.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_XBM_Image.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -39,7 +39,7 @@
Fl_XBM_Image() {}
Fl_XBM_Image(const char* filename) {
- // FIXME: 123 XBMImage_I
+ // FIXME: 123-1 XBMImage_I
_p = new fltk3::XBMImage(filename);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_XPM_Image.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_XPM_Image.H 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/FL/Fl_XPM_Image.H 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -39,7 +39,7 @@
Fl_XPM_Image() {}
Fl_XPM_Image(const char* filename) {
- // FIXME: 123 XPMImage_I
+ // FIXME: 123-1 XPMImage_I
_p = new fltk3::XPMImage(filename);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/filename.H
===================================================================
--- branches/branch-3.0/include/FL/filename.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/filename.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -29,7 +29,7 @@
#ifndef FL_FILENAME_H
#define FL_FILENAME_H
-// FIXME: 123 - this is bad because now we can only include this file from a
c++ file!
+// FIXME: 123-1 - this is bad because now we can only include this file from a
c++ file!
#include <fltk3/filename.h>
#include "Fl_Export.H"
Modified: branches/branch-3.0/include/FL/fl_ask.H
===================================================================
--- branches/branch-3.0/include/FL/fl_ask.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/fl_ask.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -93,7 +93,7 @@
return ret;
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
inline Fl_Widget *fl_message_icon();
extern inline Fl_Font fl_message_font_;
extern inline Fl_Fontsize fl_message_size_;
@@ -119,7 +119,7 @@
fltk3::message_title_default(title);
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
// pointers you can use to change FLTK to a foreign language:
extern inline const char* fl_no;
extern inline const char* fl_yes;
Modified: branches/branch-3.0/include/FL/fl_draw.H
===================================================================
--- branches/branch-3.0/include/FL/fl_draw.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/fl_draw.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -387,7 +387,7 @@
fltk3::draw(str, x, y, w, h, fltk3::_1to3_align(align),
fltk3::_1to3_image(img), draw_symbols);
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
inline void fl_draw(const char* str, int x, int y, int w, int h,
Fl_Align align,
void (*callthis)(const char *,int,int,int),
@@ -424,7 +424,7 @@
return fltk3::can_do_alpha_blending();
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
FL_EXPORT void fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int
Y,int W,int H, int D=1);
@@ -507,7 +507,7 @@
fltk3::copy_offscreen(x, y, w, h, pixmap, srcx, srcy);
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
FL_EXPORT int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int
scalable);
Modified: branches/branch-3.0/include/FL/gl.h
===================================================================
--- branches/branch-3.0/include/FL/gl.h 2012-06-10 11:10:24 UTC (rev 9582)
+++ branches/branch-3.0/include/FL/gl.h 2012-06-10 12:25:17 UTC (rev 9583)
@@ -44,7 +44,7 @@
# include <GL/gl.h>
# endif
-// FIXME: 123 - none of this is really wrapped. There is no fltk3 api for this
yet.
+// FIXME: 123-1 - none of this is really wrapped. There is no fltk3 api for
this yet.
// void gl_start();
// void gl_finish();
// void gl_rect(int x,int y,int w,int h);
Modified: branches/branch-3.0/include/FL/gl_draw.H
===================================================================
--- branches/branch-3.0/include/FL/gl_draw.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/gl_draw.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -28,7 +28,7 @@
#include "gl.h"
#error header has not been ported to 3.0 yet
-// FIXME: 123
+// FIXME: 123-1
extern FL_EXPORT void gl_remove_displaylist_fonts();
Modified: branches/branch-3.0/include/FL/glut.H
===================================================================
--- branches/branch-3.0/include/FL/glut.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/glut.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -50,7 +50,7 @@
((fltk3::GlutWindow*)_p)->make_current();
}
-#if 0 // FIXME: 123 - can't wrap
+#if 0 // FIXME: 123-1 - can't wrap
void (*display)();
void (*overlaydisplay)();
void (*reshape)(int w, int h);
@@ -79,7 +79,7 @@
return (Fl_Glut_Window*)fltk3::_3to1_window(glut_window);
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
extern FL_EXPORT Fl_Glut_Window *glut_window; // the current window
extern FL_EXPORT int glut_menu; // the current menu
Modified: branches/branch-3.0/include/FL/win32.H
===================================================================
--- branches/branch-3.0/include/FL/win32.H 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/FL/win32.H 2012-06-10 12:25:17 UTC (rev
9583)
@@ -26,7 +26,7 @@
// http://www.fltk.org/str.php
//
-// FIXME: 123 - this file has not yet been touched
+// FIXME: 123-1 - this file has not yet been touched
// Do not directly include this file, instead use <FL/x.H>. It will
// include this file if WIN32 is defined. This is to encourage
Modified: branches/branch-3.0/include/FL/x.H
===================================================================
--- branches/branch-3.0/include/FL/x.H 2012-06-10 11:10:24 UTC (rev 9582)
+++ branches/branch-3.0/include/FL/x.H 2012-06-10 12:25:17 UTC (rev 9583)
@@ -45,7 +45,7 @@
#endif
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-1
FL_EXPORT void fl_open_display();
FL_EXPORT void fl_open_display(Display*);
Modified: branches/branch-3.0/include/fltk/Color.h
===================================================================
--- branches/branch-3.0/include/fltk/Color.h 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/fltk/Color.h 2012-06-10 12:25:17 UTC (rev
9583)
@@ -104,7 +104,7 @@
WINDOWS_BLUE = 0x88 //!< default selection_color
};
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
inline Color color(unsigned char r, unsigned char g, unsigned char b) {
return Color((r<<24)+(g<<16)+(b<<8)); }
Modified: branches/branch-3.0/include/fltk/Flags.h
===================================================================
--- branches/branch-3.0/include/fltk/Flags.h 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/fltk/Flags.h 2012-06-10 12:25:17 UTC (rev
9583)
@@ -39,7 +39,7 @@
namespace fltk {
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
/// \name fltk/Flags.h
//@{
Modified: branches/branch-3.0/include/fltk/Group.h
===================================================================
--- branches/branch-3.0/include/fltk/Group.h 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/fltk/Group.h 2012-06-10 12:25:17 UTC (rev
9583)
@@ -59,7 +59,7 @@
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
int children() const {return children_;}
Widget* child(int n) const {return array_[n];}
@@ -76,7 +76,7 @@
((fltk3::Group_I*)_p)->end();
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
static Group *current() {return current_;}
static void current(Group *g) {current_ = g;}
Modified: branches/branch-3.0/include/fltk/Rectangle.h
===================================================================
--- branches/branch-3.0/include/fltk/Rectangle.h 2012-06-10 11:10:24 UTC
(rev 9582)
+++ branches/branch-3.0/include/fltk/Rectangle.h 2012-06-10 12:25:17 UTC
(rev 9583)
@@ -45,7 +45,7 @@
class Rectangle : public fltk3::WidgetWrapper {
protected:
- // FIXME: 123 - this should be public, but then it must initialize _p,
which
+ // FIXME: 123-2 - this should be public, but then it must initialize _p,
which
// in turn means that we must create a different constructor that is
called
// for a derived class (Widget).
Rectangle() {}
@@ -69,7 +69,7 @@
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
/*! Return x()+w(), the right edge of the rectangle. */
int r() const {return x_+w_;}
Modified: branches/branch-3.0/include/fltk/Style.h
===================================================================
--- branches/branch-3.0/include/fltk/Style.h 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/fltk/Style.h 2012-06-10 12:25:17 UTC (rev
9583)
@@ -33,7 +33,7 @@
namespace fltk {
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
/// \name fltk/Style.h
//@{
@@ -46,7 +46,7 @@
typedef Symbol Box;
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
struct Font;
extern FL_API Font* const HELVETICA;
extern FL_API Font* const HELVETICA_BOLD;
Modified: branches/branch-3.0/include/fltk/Valuator.h
===================================================================
--- branches/branch-3.0/include/fltk/Valuator.h 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/fltk/Valuator.h 2012-06-10 12:25:17 UTC (rev
9583)
@@ -91,7 +91,7 @@
double linesize_setting() const {return linesize_;}
#endif
- // FIXME: 123 - this method was virtual
+ // FIXME: 123-2 - this method was virtual
int format(char *f) {
return ((fltk3::Valuator_I*)_p)->format(f);
}
Modified: branches/branch-3.0/include/fltk/Widget.h
===================================================================
--- branches/branch-3.0/include/fltk/Widget.h 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/fltk/Widget.h 2012-06-10 12:25:17 UTC (rev
9583)
@@ -52,7 +52,7 @@
class FL_API Widget : public Rectangle {
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
// disable the copy assignment/constructors:
Widget & operator=(const Widget &);
Widget(const Widget &);
@@ -70,7 +70,7 @@
_p->wrapper(this);
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
virtual ~Widget();
virtual void draw();
@@ -307,7 +307,7 @@
return fltk3::_3to2_fontsize( ((fltk3::Widget_I*)_p)->labelsize() );
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
float textsize() const;
float leading() const;
unsigned char scrollbar_align() const;
@@ -318,7 +318,7 @@
((fltk3::Widget_I*)_p)->box(fltk3::_2to3_boxtype(b));
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
void buttonbox(Box*) ;
void focusbox(Box*) ;
void glyph(Symbol*) ;
@@ -331,7 +331,7 @@
((fltk3::Widget_I*)_p)->color( fltk3::_2to3_color(bg) );
}
-#if 0
+#if 0 // FIXME: 123-2
void textcolor(Color a) ;
void selection_color(Color) ;
void selection_textcolor(Color);
@@ -345,7 +345,7 @@
((fltk3::Widget_I*)_p)->labelsize(fltk3::_2to3_fontsize(a));
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
void textsize(float a) {
((fltk3::Widget_I*)_p)->textsize(fltk3::_2to3_fontsize(a));
}
Modified: branches/branch-3.0/include/fltk/Window.h
===================================================================
--- branches/branch-3.0/include/fltk/Window.h 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/fltk/Window.h 2012-06-10 12:25:17 UTC (rev
9583)
@@ -39,7 +39,7 @@
namespace fltk {
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
const int USEDEFAULT = ((int)0x80000000);
@@ -68,7 +68,7 @@
fltk3::Group::current(g);
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
static NamedStyle* default_style;
virtual ~Window();
@@ -118,7 +118,7 @@
((fltk3::Window*)_p)->show(argc, argv);
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
void show(const Window* parent);
bool exec(const Window* parent = 0, bool grab = false);
void make_exec_return(bool);
Modified: branches/branch-3.0/include/fltk/run.h
===================================================================
--- branches/branch-3.0/include/fltk/run.h 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/fltk/run.h 2012-06-10 12:25:17 UTC (rev
9583)
@@ -57,7 +57,7 @@
namespace fltk {
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
/// \name fltk/run.h
//@{
@@ -79,7 +79,7 @@
return fltk3::run();
}
-#if 0 // FIXME: 123
+#if 0 // FIXME: 123-2
FL_API void flush();
FL_API void redraw();
extern FL_API int damage_;
Modified: branches/branch-3.0/include/fltk3gl/gl.h
===================================================================
--- branches/branch-3.0/include/fltk3gl/gl.h 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/include/fltk3gl/gl.h 2012-06-10 12:25:17 UTC (rev
9583)
@@ -69,7 +69,7 @@
# include <GL/gl.h>
# endif
-//FLTK3_EXPORT // FIXME: 123 - keeping this in when compiling with VisualC
2010 we will get an error.
+//FLTK3_EXPORT // FIXME: 123-3 - keeping this in when compiling with VisualC
2010 we will get an error.
void gl_start();
FLTK3_EXPORT void gl_finish();
Modified: branches/branch-3.0/test/cube.cxx
===================================================================
--- branches/branch-3.0/test/cube.cxx 2012-06-10 11:10:24 UTC (rev 9582)
+++ branches/branch-3.0/test/cube.cxx 2012-06-10 12:25:17 UTC (rev 9583)
@@ -163,7 +163,7 @@
void print_cb(fltk3::Widget *w, void *data)
{
- fltk3::Printer printer; // FIXME: 123
+ fltk3::Printer printer; // FIXME: 123-3
fltk3::Window *win = fltk3::first_window();
if(!win) return;
if( printer.start_job(1) ) return;
Modified: branches/branch-3.0/test1/file_chooser.cxx
===================================================================
--- branches/branch-3.0/test1/file_chooser.cxx 2012-06-10 11:10:24 UTC (rev
9582)
+++ branches/branch-3.0/test1/file_chooser.cxx 2012-06-10 12:25:17 UTC (rev
9583)
@@ -105,8 +105,8 @@
fc->callback(fc_callback);
// Register the PS and PDF image types...
- // FIXME: 123 Fl_Shared_Image::add_handler(pdf_check);
- // FIXME: 123 Fl_Shared_Image::add_handler(ps_check);
+ // FIXME: 123-1 Fl_Shared_Image::add_handler(pdf_check);
+ // FIXME: 123-1 Fl_Shared_Image::add_handler(ps_check);
// Make the main window...
window = new Fl_Double_Window(400, 215, "File Chooser Test");
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
