Author: AlbrechtS
Date: 2010-04-02 05:38:57 -0700 (Fri, 02 Apr 2010)
New Revision: 7408
Log:
Some Linux-specific fixes, but doesn't compile anyway.
Todo: fltk3/x.H needs a typedef for NativeWindow, but I don't know what
would be the right one ("Window", "XID", or anything else?).
Modified:
branches/branch-3.0/FL/Fl_Native_File_Chooser_FLTK.H
branches/branch-3.0/fltk3/CheckButton.h
branches/branch-3.0/fltk3/RoundButton.h
branches/branch-3.0/src/fl_set_fonts_xft.cxx
branches/branch-3.0/src/print_panel.cxx
Modified: branches/branch-3.0/FL/Fl_Native_File_Chooser_FLTK.H
===================================================================
--- branches/branch-3.0/FL/Fl_Native_File_Chooser_FLTK.H 2010-04-02
10:51:51 UTC (rev 7407)
+++ branches/branch-3.0/FL/Fl_Native_File_Chooser_FLTK.H 2010-04-02
12:38:57 UTC (rev 7408)
@@ -98,9 +98,9 @@
// added by MG
Fl_File_Browser *my_fileList;
- Fl_Check_Button *show_hidden;
+ fltk3::CheckButton *show_hidden;
int prev_filtervalue;
- static void show_hidden_cb(Fl_Check_Button *o, void *data);
+ static void show_hidden_cb(fltk3::CheckButton *o, void *data);
static void remove_hidden_files(Fl_File_Browser *my_fileList);
// Private methods
Modified: branches/branch-3.0/fltk3/CheckButton.h
===================================================================
--- branches/branch-3.0/fltk3/CheckButton.h 2010-04-02 10:51:51 UTC (rev
7407)
+++ branches/branch-3.0/fltk3/CheckButton.h 2010-04-02 12:38:57 UTC (rev
7408)
@@ -31,7 +31,7 @@
#ifndef Fltk3_Check_Button_H
#define Fltk3_Check_Button_H
-#include "LightButton.H"
+#include "LightButton.h"
namespace fltk3 {
Modified: branches/branch-3.0/fltk3/RoundButton.h
===================================================================
--- branches/branch-3.0/fltk3/RoundButton.h 2010-04-02 10:51:51 UTC (rev
7407)
+++ branches/branch-3.0/fltk3/RoundButton.h 2010-04-02 12:38:57 UTC (rev
7408)
@@ -31,7 +31,7 @@
#ifndef Fltk3_Round_Button_H
#define Fltk3_Round_Button_H
-#include "LightButton.H"
+#include "LightButton.h"
namespace fltk3 {
Modified: branches/branch-3.0/src/fl_set_fonts_xft.cxx
===================================================================
--- branches/branch-3.0/src/fl_set_fonts_xft.cxx 2010-04-02 10:51:51 UTC
(rev 7407)
+++ branches/branch-3.0/src/fl_set_fonts_xft.cxx 2010-04-02 12:38:57 UTC
(rev 7408)
@@ -198,7 +198,7 @@
///////////////////////////////////////////////////////////
-static int fl_free_font = FL_FREE_FONT;
+static int fl_free_font = fltk3::FREE_FONT;
// Uses the fontconfig lib to construct a list of all installed fonts.
// I tried using XftListFonts for this, but the API is tricky - and when
@@ -217,7 +217,7 @@
int font_count; // Total number of fonts found to process
char **full_list; // The list of font names we build
- if (fl_free_font > FL_FREE_FONT) // already been here
+ if (fl_free_font > fltk3::FREE_FONT) // already been here
return (Fl_Font)fl_free_font;
fl_open_display(); // Just in case...
@@ -227,7 +227,7 @@
if (!FcInit())
{
// What to do? Just return defaults...
- return FL_FREE_FONT;
+ return fltk3::FREE_FONT;
}
// Create a search pattern that will match every font name - I think this
@@ -325,7 +325,7 @@
// NOTE: This just adds on AFTER the default fonts - no attempt is made
// to identify already loaded fonts. Is this bad?
stored_name = strdup(xft_name);
- fltk3::set_font((Fl_Font)(j + FL_FREE_FONT), stored_name);
+ fltk3::set_font((Fl_Font)(j + fltk3::FREE_FONT), stored_name);
fl_free_font ++;
free(full_list[j]); // release that name from our internal array
Modified: branches/branch-3.0/src/print_panel.cxx
===================================================================
--- branches/branch-3.0/src/print_panel.cxx 2010-04-02 10:51:51 UTC (rev
7407)
+++ branches/branch-3.0/src/print_panel.cxx 2010-04-02 12:38:57 UTC (rev
7408)
@@ -289,18 +289,18 @@
o->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
{ print_all = new fltk3::RoundButton(20, 96, 38, 25,
Fl_Printer::dialog_all);
print_all->type(102);
- print_all->down_box(FL_ROUND_DOWN_BOX);
+ print_all->down_box(fltk3::ROUND_DOWN_BOX);
print_all->value(1);
print_all->callback((fltk3::Callback*)cb_print_all);
} // fltk3::RoundButton* print_all
{ print_pages = new fltk3::RoundButton(20, 126, 64, 25,
Fl_Printer::dialog_pages);
print_pages->type(102);
- print_pages->down_box(FL_ROUND_DOWN_BOX);
+ print_pages->down_box(fltk3::ROUND_DOWN_BOX);
print_pages->callback((fltk3::Callback*)cb_print_pages);
} // fltk3::RoundButton* print_pages
{ print_selection = new fltk3::RoundButton(20, 156, 82, 25,
"Selection");
print_selection->type(102);
- print_selection->down_box(FL_ROUND_DOWN_BOX);
+ print_selection->down_box(fltk3::ROUND_DOWN_BOX);
print_selection->callback((fltk3::Callback*)cb_print_selection);
} // fltk3::RoundButton* print_selection
{ print_from = new Fl_Int_Input(136, 126, 28, 25,
Fl_Printer::dialog_from);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
