| |
Author: matt
Date: 2011-05-17 02:15:40 -0700 (Tue, 17 May 2011)
New Revision: 8678
Log:
123: some simple renames to avoid confusion (always a good thing). Adding the previously fiddled out wrapper concept. Implementation follows.
Added:
branches/branch-3.0/fltk3/Wrapper.h
Modified:
branches/branch-3.0/fltk3/MenuItem.h
branches/branch-3.0/fltk3/Object.h
branches/branch-3.0/fltk3/Widget.h
branches/branch-3.0/fltk3/Window.h
branches/branch-3.0/fltk3/enumerations.h
branches/branch-3.0/fltk3/forms.h
branches/branch-3.0/fltk3/run.h
branches/branch-3.0/fluid/Fl_Menu_Type.cxx
branches/branch-3.0/fluid/Fl_Widget_Type.cxx
branches/branch-3.0/fluid/alignment_panel.cxx
branches/branch-3.0/fluid/factory.cxx
branches/branch-3.0/fluid/fluid.cxx
branches/branch-3.0/fluid/function_panel.cxx
branches/branch-3.0/fluid/print_panel.cxx
branches/branch-3.0/fluid/widget_panel.cxx
branches/branch-3.0/make3.sh
branches/branch-3.0/src/Fl.cxx
branches/branch-3.0/src/Fl_Bitmap.cxx
branches/branch-3.0/src/Fl_Button.cxx
branches/branch-3.0/src/Fl_Clock.cxx
branches/branch-3.0/src/Fl_File_Icon.cxx
branches/branch-3.0/src/Fl_File_Icon2.cxx
branches/branch-3.0/src/Fl_Help_View.cxx
branches/branch-3.0/src/Fl_Image.cxx
branches/branch-3.0/src/Fl_Light_Button.cxx
branches/branch-3.0/src/Fl_Menu.cxx
branches/branch-3.0/src/Fl_Multi_Label.cxx
branches/branch-3.0/src/Fl_Pixmap.cxx
branches/branch-3.0/src/Fl_PostScript.cxx
branches/branch-3.0/src/Fl_Return_Button.cxx
branches/branch-3.0/src/Fl_Scrollbar.cxx
branches/branch-3.0/src/Fl_Text_Display.cxx
branches/branch-3.0/src/Fl_Tree.cxx
branches/branch-3.0/src/Fl_Widget.cxx
branches/branch-3.0/src/Fl_Window.cxx
branches/branch-3.0/src/Fl_cocoa.mm
branches/branch-3.0/src/Fl_get_system_colors.cxx
branches/branch-3.0/src/Fl_mac.cxx
branches/branch-3.0/src/Fl_win32.cxx
branches/branch-3.0/src/Fl_x.cxx
branches/branch-3.0/src/fl_boxtype.cxx
branches/branch-3.0/src/fl_color.cxx
branches/branch-3.0/src/fl_color_mac.cxx
branches/branch-3.0/src/fl_color_win32.cxx
branches/branch-3.0/src/fl_diamond_box.cxx
branches/branch-3.0/src/fl_gtk.cxx
branches/branch-3.0/src/fl_labeltype.cxx
branches/branch-3.0/src/fl_plastic.cxx
branches/branch-3.0/src/fl_round_box.cxx
branches/branch-3.0/src/fl_symbols.cxx
branches/branch-3.0/src/print_panel.cxx
branches/branch-3.0/test/hello.cxx
Modified: branches/branch-3.0/fltk3/MenuItem.h
===================================================================
--- branches/branch-3.0/fltk3/MenuItem.h 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fltk3/MenuItem.h 2011-05-17 09:15:40 UTC (rev 8678)
@@ -164,7 +164,7 @@
A labeltype identifies a routine that draws the label of the
widget. This can be used for special effects such as emboss, or to use
the label() pointer as another form of data such as a bitmap.
- The value fltk3::normalLabel prints the label as text.
+ The value fltk3::NORMAL_LABEL prints the label as text.
*/
fltk3::Labeltype labeltype() const {return (fltk3::Labeltype)labeltype_;}
@@ -173,7 +173,7 @@
A labeltype identifies a routine that draws the label of the
widget. This can be used for special effects such as emboss, or to use
the label() pointer as another form of data such as a bitmap.
- The value fltk3::normalLabel prints the label as text.
+ The value fltk3::NORMAL_LABEL prints the label as text.
*/
void labeltype(fltk3::Labeltype a) {labeltype_ = a;}
Modified: branches/branch-3.0/fltk3/Object.h
===================================================================
--- branches/branch-3.0/fltk3/Object.h 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fltk3/Object.h 2011-05-17 09:15:40 UTC (rev 8678)
@@ -1,7 +1,7 @@
//
-// "$Id: Object.h 7903 2010-11-28 21:06:39Z matt $"
+// "$Id: Wrapper.h 7365 2010-03-30 15:18:29Z matt $"
//
-// Old Fl_Object header file for the Fast Light Tool Kit (FLTK).
+// Widget header file for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2010 by Bill Spitzak and others.
//
@@ -25,12 +25,35 @@
// http://www.fltk.org/str.php
//
-// This file is provided for back compatibility only. Please use fltk3::Widget
-#ifndef Fl_Object
-#define Fl_Object fltk3::Widget
+/* \file
+ fltk3::Object */
+
+#ifndef FLTK3_OBJECT_H
+#define FLTK3_OBJECT_H
+
+namespace fltk3 {
+
+ class Wrapper;
+
+/**
+ * \brief a base class for any kind of langage wrapper around FLTK3.
+ */
+ class Object {
+ protected:
+ Wrapper *pWrapper;
+ public:
+ Object()
+ : pWrapper(0L) { }
+ virtual ~Object();
+ Wrapper *wrapper() { return this?pWrapper:0L; }
+ void wrapper(Wrapper *w) { pWrapper = w; }
+ };
+
+}; // namespace fltk3
+
+
#endif
-#include "Widget.h"
//
-// End of "$Id: Object.h 7903 2010-11-28 21:06:39Z matt $".
+// End of "$Id: Wrapper.h 7365 2010-03-30 15:18:29Z matt $".
//
Modified: branches/branch-3.0/fltk3/Widget.h
===================================================================
--- branches/branch-3.0/fltk3/Widget.h 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fltk3/Widget.h 2011-05-17 09:15:40 UTC (rev 8678)
@@ -32,6 +32,7 @@
#define Fl_Widget_H
#include "enumerations.h"
+#include "Object.h"
/**
\todo typedef's fl_intptr_t and fl_uintptr_t should be documented.
@@ -110,7 +111,7 @@
functions, even if they change the widget's appearance. It is up to the
user code to call redraw() after these.
*/
- class FL_EXPORT Widget {
+ class FL_EXPORT Widget : public Object {
friend class Group;
fltk3::Group* parent_;
@@ -380,7 +381,7 @@
/** Sets the background color of the widget.
The color is passed to the box routine. The color is either an index into
an internal table of RGB colors or an RGB color value generated using
- fltk3::rgbColor().
+ fltk3::rgb_color().
The default for most widgets is fltk3::BACKGROUND_COLOR. Use Fl::set_color()
to redefine colors in the color map.
@@ -459,7 +460,7 @@
The label type identifies the function that draws the label of the widget.
This is generally used for special effects such as embossing or for using
the label() pointer as another form of data such as an icon. The value
- fltk3::normalLabel prints the label as plain text.
+ fltk3::NORMAL_LABEL prints the label as plain text.
\param[in] a new label type
\see fltk3::Labeltype
*/
Modified: branches/branch-3.0/fltk3/Window.h
===================================================================
--- branches/branch-3.0/fltk3/Window.h 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fltk3/Window.h 2011-05-17 09:15:40 UTC (rev 8678)
@@ -26,7 +26,7 @@
//
/* \file
- fltk3::Window widget . */
+ fltk3::Window widget . */
#ifndef FLTK3_WINDOW_H
#define FLTK3_WINDOW_H
@@ -39,427 +39,430 @@
class Fl_X;
namespace fltk3 {
-
-/**
- This widget produces an actual window. This can either be a main
- window, with a border and title and all the window management controls,
- or a "subwindow" inside a window. This is controlled by whether or not
- the window has a parent().
-
- Once you create a window, you usually add children fltk3::Widget
- 's to it by using window->add(child) for each new widget.
- See fltk3::Group for more information on how to add and remove children.
-
- There are several subclasses of fltk3::Window that provide
- double-buffering, overlay, menu, and OpenGL support.
-
- The window's callback is done if the user tries to close a window
- using the window manager and Fl::modal() is zero or equal to the
- window. fltk3::Window has a default callback that calls fltk3::Window::hide().
-*/
-class FL_EXPORT Window : public Group {
-
- static char *default_xclass_;
-
- friend class ::Fl_X;
- Fl_X *i; // points at the system-specific stuff
-
- const char* iconlabel_;
- char* xclass_;
- const void* icon_;
- // size_range stuff:
- int minw, minh, maxw, maxh;
- int dw, dh, aspect;
- uchar size_range_set;
- // cursor stuff
- fltk3::Cursor cursor_default;
- fltk3::Color cursor_fg, cursor_bg;
- void size_range_();
- void _Fl_Window(); // constructor innards
-
- // unimplemented copy ctor and assignment operator
- Window(const Window&);
- Window& operator=(const Window&);
-
-protected:
-
- /** Stores the last window that was made current. See current() const */
- static Window *current_;
- virtual void draw();
- /** Forces the window to be drawn, this window is also made current and calls draw(). */
- virtual void flush();
-
+
/**
- Sets an internal flag that tells FLTK and the window manager to
- honor position requests.
-
- This is used internally and should not be needed by user code.
-
- \param[in] force 1 to set the FORCE_POSITION flag, 0 to clear it
- */
- void force_position(int force) {
- if (force) set_flag(FORCE_POSITION);
- else clear_flag(FORCE_POSITION);
- }
- /**
- Returns the internal state of the window's FORCE_POSITION flag.
-
- \retval 1 if flag is set
- \retval 0 otherwise
-
- \see force_position(int)
- */
- int force_position() const { return ((flags() & FORCE_POSITION)?1:0); }
-
-public:
-
- /**
- Creates a window from the given size and title.
- If fltk3::Group::current() is not NULL, the window is created as a
- subwindow of the parent window.
+ This widget produces an actual window. This can either be a main
+ window, with a border and title and all the window management controls,
+ or a "subwindow" inside a window. This is controlled by whether or not
+ the window has a parent().
+
+ Once you create a window, you usually add children fltk3::Widget
+ 's to it by using window->add(child) for each new widget.
+ See fltk3::Group for more information on how to add and remove children.
+
+ There are several subclasses of fltk3::Window that provide
+ double-buffering, overlay, menu, and OpenGL support.
+
+ The window's callback is done if the user tries to close a window
+ using the window manager and Fl::modal() is zero or equal to the
+ window. fltk3::Window has a default callback that calls fltk3::Window::hide().
+ */
+ class FL_EXPORT Window : public Group {
- The (w,h) form of the constructor creates a top-level window
- and asks the window manager to position the window. The (x,y,w,h)
- form of the constructor either creates a subwindow or a
- top-level window at the specified location (x,y) , subject to window
- manager configuration. If you do not specify the position of the
- window, the window manager will pick a place to show the window
- or allow the user to pick a location. Use position(x,y)
- or hotspot() before calling show() to request a
- position on the screen. See fltk3::Window::resize()
- for some more details on positioning windows.
+ static char *default_xclass_;
- Top-level windows initially have visible() set to 0
- and parent() set to NULL. Subwindows initially
- have visible() set to 1 and parent() set to
- the parent window pointer.
+ friend class ::Fl_X;
+ Fl_X *i; // points at the system-specific stuff
- fltk3::Widget::box() defaults to fltk3::FLAT_BOX. If you plan to
- completely fill the window with children widgets you should
- change this to fltk3::NO_BOX. If you turn the window border off
- you may want to change this to fltk3::UP_BOX.
-
- \see fltk3::Window(int x, int y, int w, int h, const char* title)
- */
+ const char* iconlabel_;
+ char* xclass_;
+ const void* icon_;
+ // size_range stuff:
+ int minw, minh, maxw, maxh;
+ int dw, dh, aspect;
+ uchar size_range_set;
+ // cursor stuff
+ fltk3::Cursor cursor_default;
+ fltk3::Color cursor_fg, cursor_bg;
+ void size_range_();
+ void _Fl_Window(); // constructor innards
+
+ // unimplemented copy ctor and assignment operator
+ Window(const Window&);
+ Window& operator=(const Window&);
+
+ protected:
+
+ /** Stores the last window that was made current. See current() const */
+ static Window *current_;
+ virtual void draw();
+ /** Forces the window to be drawn, this window is also made current and calls draw(). */
+ virtual void flush();
+
+ /**
+ Sets an internal flag that tells FLTK and the window manager to
+ honor position requests.
+
+ This is used internally and should not be needed by user code.
+
+ \param[in] force 1 to set the FORCE_POSITION flag, 0 to clear it
+ */
+ void force_position(int force) {
+ if (force) set_flag(FORCE_POSITION);
+ else clear_flag(FORCE_POSITION);
+ }
+ /**
+ Returns the internal state of the window's FORCE_POSITION flag.
+
+ \retval 1 if flag is set
+ \retval 0 otherwise
+
+ \see force_position(int)
+ */
+ int force_position() const { return ((flags() & FORCE_POSITION)?1:0); }
+
+ public:
+
+ /**
+ Creates a window from the given size and title.
+ If fltk3::Group::current() is not NULL, the window is created as a
+ subwindow of the parent window.
+
+ The (w,h) form of the constructor creates a top-level window
+ and asks the window manager to position the window. The (x,y,w,h)
+ form of the constructor either creates a subwindow or a
+ top-level window at the specified location (x,y) , subject to window
+ manager configuration. If you do not specify the position of the
+ window, the window manager will pick a place to show the window
+ or allow the user to pick a location. Use position(x,y)
+ or hotspot() before calling show() to request a
+ position on the screen. See fltk3::Window::resize()
+ for some more details on positioning windows.
+
+ Top-level windows initially have visible() set to 0
+ and parent() set to NULL. Subwindows initially
+ have visible() set to 1 and parent() set to
+ the parent window pointer.
+
+ fltk3::Widget::box() defaults to fltk3::FLAT_BOX. If you plan to
+ completely fill the window with children widgets you should
+ change this to fltk3::NO_BOX. If you turn the window border off
+ you may want to change this to fltk3::UP_BOX.
+
+ \see fltk3::Window(int x, int y, int w, int h, const char* title)
+ */
Window(int w, int h, const char* title= 0);
- /** Creates a window from the given position, size and title.
-
- \see fltk3::Window(int w, int h, const char *title)
- */
+ /** Creates a window from the given position, size and title.
+
+ \see fltk3::Window(int w, int h, const char *title)
+ */
Window(int x, int y, int w, int h, const char* title = 0);
- /**
- The destructor <I>also deletes all the children</I>. This allows a
- whole tree to be deleted at once, without having to keep a pointer to
- all the children in the user code. A kludge has been done so the
- fltk3::Window and all of its children can be automatic (local)
- variables, but you must declare the fltk3::Window <I>first</I> so
- that it is destroyed last.
- */
+ /**
+ The destructor <I>also deletes all the children</I>. This allows a
+ whole tree to be deleted at once, without having to keep a pointer to
+ all the children in the user code. A kludge has been done so the
+ fltk3::Window and all of its children can be automatic (local)
+ variables, but you must declare the fltk3::Window <I>first</I> so
+ that it is destroyed last.
+ */
virtual ~Window();
-
- virtual int handle(int);
-
- /**
- Changes the size and position of the window. If shown() is true,
- these changes are communicated to the window server (which may
- refuse that size and cause a further resize). If shown() is
- false, the size and position are used when show() is called.
- See fltk3::Group for the effect of resizing on the child widgets.
-
- You can also call the fltk3::Widget methods size(x,y) and position(w,h),
- which are inline wrappers for this virtual function.
-
- A top-level window can not force, but merely suggest a position and
- size to the operating system. The window manager may not be willing or
- able to display a window at the desired position or with the given
- dimensions. It is up to the application developer to verify window
- parameters after the resize request.
- */
- virtual void resize(int,int,int,int);
- /**
- Sets whether or not the window manager border is around the
- window. The default value is true. void border(int) can be
- used to turn the border on and off. <I>Under most X window
- managers this does not work after show() has been called,
- although SGI's 4DWM does work.</I>
- */
- void border(int b);
- /**
- Fast inline function to turn the window manager border
- off. It only works before show() is called.
- */
- void clear_border() {set_flag(NOBORDER);}
- /** See void fltk3::Window::border(int) */
- unsigned int border() const {return !(flags() & NOBORDER);}
- /** Activates the flags NOBORDER|FL_OVERRIDE */
- void set_override() {set_flag(NOBORDER|OVERRIDE);}
- /** Returns non zero if FL_OVERRIDE flag is set, 0 otherwise. */
- unsigned int override() const { return flags()&OVERRIDE; }
- /**
- A "modal" window, when shown(), will prevent any events from
- being delivered to other windows in the same program, and will also
- remain on top of the other windows (if the X window manager supports
- the "transient for" property). Several modal windows may be shown at
- once, in which case only the last one shown gets events. You can see
- which window (if any) is modal by calling Fl::modal().
- */
- void set_modal() {set_flag(MODAL);}
- /** Returns true if this window is modal. */
- unsigned int modal() const {return flags() & MODAL;}
- /**
- A "non-modal" window (terminology borrowed from Microsoft Windows)
- acts like a modal() one in that it remains on top, but it has
- no effect on event delivery. There are <I>three</I> states for a
- window: modal, non-modal, and normal.
- */
- void set_non_modal() {set_flag(NON_MODAL);}
- /** Returns true if this window is modal or non-modal. */
- unsigned int non_modal() const {return flags() & (NON_MODAL|MODAL);}
-
- /**
- Marks the window as a menu window.
-
- This is intended for internal use, but it can also be used if you
- write your own menu handling. However, this is not recommended.
-
- This flag is used for correct "parenting" of windows in communication
- with the windowing system. Modern X window managers can use different
- flags to distinguish menu and tooltip windows from normal windows.
-
- This must be called before the window is shown and cannot be changed
- later.
- */
- void set_menu_window() {set_flag(MENU_WINDOW);}
-
- /** Returns true if this window is a menu window. */
- unsigned int menu_window() const {return flags() & MENU_WINDOW;}
-
- /**
- Marks the window as a tooltip window.
-
- This is intended for internal use, but it can also be used if you
- write your own tooltip handling. However, this is not recommended.
-
- This flag is used for correct "parenting" of windows in communication
- with the windowing system. Modern X window managers can use different
- flags to distinguish menu and tooltip windows from normal windows.
-
- This must be called before the window is shown and cannot be changed
- later.
-
- \note Since Fl_Tooltip_Window is derived from Fl_Menu_Window, this
- also \b clears the menu_window() state.
- */
- void set_tooltip_window() { set_flag(TOOLTIP_WINDOW);
- clear_flag(MENU_WINDOW); }
- /** Returns true if this window is a tooltip window. */
- unsigned int tooltip_window() const {return flags() & TOOLTIP_WINDOW;}
-
- /**
- Positions the window so that the mouse is pointing at the given
- position, or at the center of the given widget, which may be the
- window itself. If the optional offscreen parameter is
- non-zero, then the window is allowed to extend off the screen (this
- does not work with some X window managers). \see position()
- */
- void hotspot(int x, int y, int offscreen = 0);
- /** See void fltk3::Window::hotspot(int x, int y, int offscreen = 0) */
- void hotspot(const fltk3::Widget*, int offscreen = 0);
- /** See void fltk3::Window::hotspot(int x, int y, int offscreen = 0) */
- void hotspot(const fltk3::Widget& p, int offscreen = 0) {hotspot(&p,offscreen);}
-
- /**
- Undoes the effect of a previous resize() or show() so that the next time
- show() is called the window manager is free to position the window.
-
- This is for Forms compatibility only.
-
- \deprecated please use force_position(0) instead
- */
- void free_position() {clear_flag(FORCE_POSITION);}
- /**
- Sets the allowable range the user can resize this window to.
- This only works for top-level windows.
- <UL>
- <LI>minw and minh are the smallest the window can be.
- Either value must be greater than 0.</LI>
- <LI>maxw and maxh are the largest the window can be. If either is
- <I>equal</I> to the minimum then you cannot resize in that direction.
- If either is zero then FLTK picks a maximum size in that direction
- such that the window will fill the screen.</LI>
- <LI>dw and dh are size increments. The window will be constrained
- to widths of minw + N * dw, where N is any non-negative integer.
- If these are less or equal to 1 they are ignored (this is ignored
- on WIN32).</LI>
- <LI>aspect is a flag that indicates that the window should preserve its
- aspect ratio. This only works if both the maximum and minimum have
- the same aspect ratio (ignored on WIN32 and by many X window managers).
- </LI>
- </UL>
-
- If this function is not called, FLTK tries to figure out the range
- from the setting of resizable():
- <UL>
- <LI>If resizable() is NULL (this is the default) then the window cannot
- be resized and the resize border and max-size control will not be
- displayed for the window.</LI>
- <LI>If either dimension of resizable() is less than 100, then that is
- considered the minimum size. Otherwise the resizable() has a minimum
- size of 100.</LI>
- <LI>If either dimension of resizable() is zero, then that is also the
- maximum size (so the window cannot resize in that direction).</LI>
- </UL>
-
- It is undefined what happens if the current size does not fit in the
- constraints passed to size_range().
- */
- void size_range(int a, int b, int c=0, int d=0, int e=0, int f=0, int g=0) {
- minw=a; minh=b; maxw=c; maxh=d; dw=e; dh=f; aspect=g; size_range_();}
-
- /** See void fltk3::Window::label(const char*) */
- const char* label() const {return fltk3::Widget::label();}
- /** See void fltk3::Window::iconlabel(const char*) */
- const char* iconlabel() const {return iconlabel_;}
- /** Sets the window title bar label. */
- void label(const char*);
- /** Sets the icon label. */
- void iconlabel(const char*);
- /** Sets the icon label. */
- void label(const char* label, const char* iconlabel); // platform dependent
- void copy_label(const char* a);
-
- static void default_xclass(const char*);
- static const char *default_xclass();
- const char* xclass() const;
- void xclass(const char* c);
- const void* icon() const;
- void icon(const void * ic);
-
- /**
- Returns non-zero if show() has been called (but not hide()
- ). You can tell if a window is iconified with (w->shown()
- && !w->visible()).
- */
- int shown() {return i != 0;}
- /**
- Puts the window on the screen. Usually (on X) this has the side
- effect of opening the display.
-
- If the window is already shown then it is restored and raised to the
- top. This is really convenient because your program can call show()
- at any time, even if the window is already up. It also means that
- show() serves the purpose of raise() in other toolkits.
- fltk3::Window::show(int argc, char **argv) is used for top-level
- windows and allows standard arguments to be parsed from the
- command-line.
+ virtual int handle(int);
- \see fltk3::Window::show(int argc, char **argv)
- */
- virtual void show();
- /**
- Removes the window from the screen. If the window is already hidden or
- has not been shown then this does nothing and is harmless.
- */
- virtual void hide();
- /**
- Puts the window on the screen and parses command-line arguments.
-
- Usually (on X) this has the side effect of opening the display.
-
- This form should be used for top-level windows, at least for the
- first (main) window. It allows standard arguments to be parsed
- from the command-line. You can use \p argc and \p argv from
- main(int argc, char **argv) for this call.
-
- The first call also sets up some system-specific internal
- variables like the system colors.
-
- \todo explain which system parameters are set up.
-
- \param argc command-line argument count, usually from main()
- \param argv command-line argument vector, usually from main()
-
- \see virtual void fltk3::Window::show()
- */
- void show(int argc, char **argv);
- /**
- Makes the window completely fill the screen, without any window
- manager border visible. You must use fullscreen_off() to undo
- this. This may not work with all window managers.
- */
- void fullscreen();
- /**
- Turns off any side effects of fullscreen() and does
- resize(x,y,w,h).
- */
- void fullscreen_off(int,int,int,int);
- /**
- Iconifies the window. If you call this when shown() is false
- it will show() it as an icon. If the window is already
- iconified this does nothing.
-
- Call show() to restore the window.
-
- When a window is iconified/restored (either by these calls or by the
- user) the handle() method is called with fltk3::HIDE and
- fltk3::SHOW events and visible() is turned on and off.
-
- There is no way to control what is drawn in the icon except with the
- string passed to fltk3::Window::xclass(). You should not rely on
- window managers displaying the icons.
- */
- void iconize();
-
- int x_root() const ;
- int y_root() const ;
-
- static Window *current();
- /**
- Sets things up so that the drawing functions in <fltk3/draw.h> will go
- into this window. This is useful for incremental update of windows, such
- as in an idle callback, which will make your program behave much better
- if it draws a slow graphic. <B>Danger: incremental update is very hard to
- debug and maintain!</B>
-
- This method only works for the fltk3::Window and Fl_Gl_Window derived classes.
- */
- void make_current();
-
- // Note: Doxygen docs in Widget.h to avoid redundancy.
- virtual Window* as_window() { return this; }
-
- /**
- Changes the cursor for this window. This always calls the system, if
- you are changing the cursor a lot you may want to keep track of how
- you set it in a static variable and call this only if the new cursor
- is different.
-
- The type fltk3::Cursor is an enumeration defined in <fltk3/enumerations.h>.
- (Under X you can get any XC_cursor value by passing
- fltk3::Cursor((XC_foo/2)+1)). The colors only work on X, they are
- not implemented on WIN32.
-
- For back compatibility only.
- */
- void cursor(fltk3::Cursor, fltk3::Color=fltk3::BLACK, fltk3::Color=fltk3::WHITE); // platform dependent
- void default_cursor(fltk3::Cursor, fltk3::Color=fltk3::BLACK, fltk3::Color=fltk3::WHITE);
- static void default_callback(Window*, void* v);
+ /**
+ Changes the size and position of the window. If shown() is true,
+ these changes are communicated to the window server (which may
+ refuse that size and cause a further resize). If shown() is
+ false, the size and position are used when show() is called.
+ See fltk3::Group for the effect of resizing on the child widgets.
+
+ You can also call the fltk3::Widget methods size(x,y) and position(w,h),
+ which are inline wrappers for this virtual function.
+
+ A top-level window can not force, but merely suggest a position and
+ size to the operating system. The window manager may not be willing or
+ able to display a window at the desired position or with the given
+ dimensions. It is up to the application developer to verify window
+ parameters after the resize request.
+ */
+ virtual void resize(int,int,int,int);
+ /**
+ Sets whether or not the window manager border is around the
+ window. The default value is true. void border(int) can be
+ used to turn the border on and off. <I>Under most X window
+ managers this does not work after show() has been called,
+ although SGI's 4DWM does work.</I>
+ */
+ void border(int b);
+ /**
+ Fast inline function to turn the window manager border
+ off. It only works before show() is called.
+ */
+ void clear_border() {set_flag(NOBORDER);}
+ /** See void fltk3::Window::border(int) */
+ unsigned int border() const {return !(flags() & NOBORDER);}
+ /** Activates the flags NOBORDER|FL_OVERRIDE */
+ void set_override() {set_flag(NOBORDER|OVERRIDE);}
+ /** Returns non zero if FL_OVERRIDE flag is set, 0 otherwise. */
+ unsigned int override() const { return flags()&OVERRIDE; }
+ /**
+ A "modal" window, when shown(), will prevent any events from
+ being delivered to other windows in the same program, and will also
+ remain on top of the other windows (if the X window manager supports
+ the "transient for" property). Several modal windows may be shown at
+ once, in which case only the last one shown gets events. You can see
+ which window (if any) is modal by calling Fl::modal().
+ */
+ void set_modal() {set_flag(MODAL);}
+ /** Returns true if this window is modal. */
+ unsigned int modal() const {return flags() & MODAL;}
+ /**
+ A "non-modal" window (terminology borrowed from Microsoft Windows)
+ acts like a modal() one in that it remains on top, but it has
+ no effect on event delivery. There are <I>three</I> states for a
+ window: modal, non-modal, and normal.
+ */
+ void set_non_modal() {set_flag(NON_MODAL);}
+ /** Returns true if this window is modal or non-modal. */
+ unsigned int non_modal() const {return flags() & (NON_MODAL|MODAL);}
+
+ /**
+ Marks the window as a menu window.
+
+ This is intended for internal use, but it can also be used if you
+ write your own menu handling. However, this is not recommended.
+
+ This flag is used for correct "parenting" of windows in communication
+ with the windowing system. Modern X window managers can use different
+ flags to distinguish menu and tooltip windows from normal windows.
+
+ This must be called before the window is shown and cannot be changed
+ later.
+ */
+ void set_menu_window() {set_flag(MENU_WINDOW);}
+
+ /** Returns true if this window is a menu window. */
+ unsigned int menu_window() const {return flags() & MENU_WINDOW;}
+
+ /**
+ Marks the window as a tooltip window.
+
+ This is intended for internal use, but it can also be used if you
+ write your own tooltip handling. However, this is not recommended.
+
+ This flag is used for correct "parenting" of windows in communication
+ with the windowing system. Modern X window managers can use different
+ flags to distinguish menu and tooltip windows from normal windows.
+
+ This must be called before the window is shown and cannot be changed
+ later.
+
+ \note Since Fl_Tooltip_Window is derived from Fl_Menu_Window, this
+ also \b clears the menu_window() state.
+ */
+ void set_tooltip_window() {
+ set_flag(TOOLTIP_WINDOW);
+ clear_flag(MENU_WINDOW);
+ }
+
+ /** Returns true if this window is a tooltip window. */
+ unsigned int tooltip_window() const {return flags() & TOOLTIP_WINDOW;}
+
+ /**
+ Positions the window so that the mouse is pointing at the given
+ position, or at the center of the given widget, which may be the
+ window itself. If the optional offscreen parameter is
+ non-zero, then the window is allowed to extend off the screen (this
+ does not work with some X window managers). \see position()
+ */
+ void hotspot(int x, int y, int offscreen = 0);
+ /** See void fltk3::Window::hotspot(int x, int y, int offscreen = 0) */
+ void hotspot(const fltk3::Widget*, int offscreen = 0);
+ /** See void fltk3::Window::hotspot(int x, int y, int offscreen = 0) */
+ void hotspot(const fltk3::Widget& p, int offscreen = 0) {hotspot(&p,offscreen);}
+
+ /**
+ Undoes the effect of a previous resize() or show() so that the next time
+ show() is called the window manager is free to position the window.
+
+ This is for Forms compatibility only.
+
+ \deprecated please use force_position(0) instead
+ */
+ void free_position() {clear_flag(FORCE_POSITION);}
+ /**
+ Sets the allowable range the user can resize this window to.
+ This only works for top-level windows.
+ <UL>
+ <LI>minw and minh are the smallest the window can be.
+ Either value must be greater than 0.</LI>
+ <LI>maxw and maxh are the largest the window can be. If either is
+ <I>equal</I> to the minimum then you cannot resize in that direction.
+ If either is zero then FLTK picks a maximum size in that direction
+ such that the window will fill the screen.</LI>
+ <LI>dw and dh are size increments. The window will be constrained
+ to widths of minw + N * dw, where N is any non-negative integer.
+ If these are less or equal to 1 they are ignored (this is ignored
+ on WIN32).</LI>
+ <LI>aspect is a flag that indicates that the window should preserve its
+ aspect ratio. This only works if both the maximum and minimum have
+ the same aspect ratio (ignored on WIN32 and by many X window managers).
+ </LI>
+ </UL>
+
+ If this function is not called, FLTK tries to figure out the range
+ from the setting of resizable():
+ <UL>
+ <LI>If resizable() is NULL (this is the default) then the window cannot
+ be resized and the resize border and max-size control will not be
+ displayed for the window.</LI>
+ <LI>If either dimension of resizable() is less than 100, then that is
+ considered the minimum size. Otherwise the resizable() has a minimum
+ size of 100.</LI>
+ <LI>If either dimension of resizable() is zero, then that is also the
+ maximum size (so the window cannot resize in that direction).</LI>
+ </UL>
+
+ It is undefined what happens if the current size does not fit in the
+ constraints passed to size_range().
+ */
+ void size_range(int a, int b, int c=0, int d=0, int e=0, int f=0, int g=0) {
+ minw=a; minh=b; maxw=c; maxh=d; dw=e; dh=f; aspect=g; size_range_();}
+
+ /** See void fltk3::Window::label(const char*) */
+ const char* label() const {return fltk3::Widget::label();}
+ /** See void fltk3::Window::iconlabel(const char*) */
+ const char* iconlabel() const {return iconlabel_;}
+ /** Sets the window title bar label. */
+ void label(const char*);
+ /** Sets the icon label. */
+ void iconlabel(const char*);
+ /** Sets the icon label. */
+ void label(const char* label, const char* iconlabel); // platform dependent
+ void copy_label(const char* a);
+
+ static void default_xclass(const char*);
+ static const char *default_xclass();
+ const char* xclass() const;
+ void xclass(const char* c);
+ const void* icon() const;
+ void icon(const void * ic);
+
+ /**
+ Returns non-zero if show() has been called (but not hide()
+ ). You can tell if a window is iconified with (w->shown()
+ && !w->visible()).
+ */
+ int shown() {return i != 0;}
+ /**
+ Puts the window on the screen. Usually (on X) this has the side
+ effect of opening the display.
+
+ If the window is already shown then it is restored and raised to the
+ top. This is really convenient because your program can call show()
+ at any time, even if the window is already up. It also means that
+ show() serves the purpose of raise() in other toolkits.
+
+ fltk3::Window::show(int argc, char **argv) is used for top-level
+ windows and allows standard arguments to be parsed from the
+ command-line.
+
+ \see fltk3::Window::show(int argc, char **argv)
+ */
+ virtual void show();
+ /**
+ Removes the window from the screen. If the window is already hidden or
+ has not been shown then this does nothing and is harmless.
+ */
+ virtual void hide();
+ /**
+ Puts the window on the screen and parses command-line arguments.
+
+ Usually (on X) this has the side effect of opening the display.
+
+ This form should be used for top-level windows, at least for the
+ first (main) window. It allows standard arguments to be parsed
+ from the command-line. You can use \p argc and \p argv from
+ main(int argc, char **argv) for this call.
+
+ The first call also sets up some system-specific internal
+ variables like the system colors.
+
+ \todo explain which system parameters are set up.
+
+ \param argc command-line argument count, usually from main()
+ \param argv command-line argument vector, usually from main()
+
+ \see virtual void fltk3::Window::show()
+ */
+ void show(int argc, char **argv);
+ /**
+ Makes the window completely fill the screen, without any window
+ manager border visible. You must use fullscreen_off() to undo
+ this. This may not work with all window managers.
+ */
+ void fullscreen();
+ /**
+ Turns off any side effects of fullscreen() and does
+ resize(x,y,w,h).
+ */
+ void fullscreen_off(int,int,int,int);
+ /**
+ Iconifies the window. If you call this when shown() is false
+ it will show() it as an icon. If the window is already
+ iconified this does nothing.
+
+ Call show() to restore the window.
+
+ When a window is iconified/restored (either by these calls or by the
+ user) the handle() method is called with fltk3::HIDE and
+ fltk3::SHOW events and visible() is turned on and off.
+
+ There is no way to control what is drawn in the icon except with the
+ string passed to fltk3::Window::xclass(). You should not rely on
+ window managers displaying the icons.
+ */
+ void iconize();
+
+ int x_root() const ;
+ int y_root() const ;
+
+ static Window *current();
+ /**
+ Sets things up so that the drawing functions in <fltk3/draw.h> will go
+ into this window. This is useful for incremental update of windows, such
+ as in an idle callback, which will make your program behave much better
+ if it draws a slow graphic. <B>Danger: incremental update is very hard to
+ debug and maintain!</B>
+
+ This method only works for the fltk3::Window and Fl_Gl_Window derived classes.
+ */
+ void make_current();
+
+ // Note: Doxygen docs in Widget.h to avoid redundancy.
+ virtual Window* as_window() { return this; }
+
+ /**
+ Changes the cursor for this window. This always calls the system, if
+ you are changing the cursor a lot you may want to keep track of how
+ you set it in a static variable and call this only if the new cursor
+ is different.
+
+ The type fltk3::Cursor is an enumeration defined in <fltk3/enumerations.h>.
+ (Under X you can get any XC_cursor value by passing
+ fltk3::Cursor((XC_foo/2)+1)). The colors only work on X, they are
+ not implemented on WIN32.
+
+ For back compatibility only.
+ */
+ void cursor(fltk3::Cursor, fltk3::Color=fltk3::BLACK, fltk3::Color=fltk3::WHITE); // platform dependent
+ void default_cursor(fltk3::Cursor, fltk3::Color=fltk3::BLACK, fltk3::Color=fltk3::WHITE);
+ static void default_callback(Window*, void* v);
+
+ /** Returns the window width including any frame added by the window manager.
+
+ Same as w() if applied to a subwindow.
+ */
+ int decorated_w();
+ /** Returns the window height including any window title bar and any frame
+ added by the window manager.
+
+ Same as h() if applied to a subwindow.
+ */
+ int decorated_h();
+
+ };
- /** Returns the window width including any frame added by the window manager.
-
- Same as w() if applied to a subwindow.
- */
- int decorated_w();
- /** Returns the window height including any window title bar and any frame
- added by the window manager.
-
- Same as h() if applied to a subwindow.
- */
- int decorated_h();
-
-};
-
} // namespace
#endif
Added: branches/branch-3.0/fltk3/Wrapper.h
===================================================================
--- branches/branch-3.0/fltk3/Wrapper.h (rev 0)
+++ branches/branch-3.0/fltk3/Wrapper.h 2011-05-17 09:15:40 UTC (rev 8678)
@@ -0,0 +1,133 @@
+//
+// "$Id: Wrapper.h 7365 2010-03-30 15:18:29Z matt $"
+//
+// Widget header file for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2010 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems on the following page:
+//
+// http://www.fltk.org/str.php
+//
+
+/* \file
+ fltk3::Wrapper */
+
+#ifndef FLTK3_Wrapper_H
+#define FLTK3_Wrapper_H
+
+#define FLTK3_WRAPPER_VCALLS_OBJECT(proto, call, flag) \
+ virtual void proto { \
+ if ( pVCalls & pVCallWidget##flag ) { \
+ } else { \
+ pVCalls |= pVCallWidget##flag; \
+ ((fltk3::Widget*)_p)->call; \
+ pVCalls &= ~pVCallWidget##flag; \
+ } \
+ }
+
+#define FLTK3_OBJECT_VCALLS_WRAPPER(call, flag) \
+ if (pWrapper) { \
+ if ( pWrapper->pVCalls & Wrapper::pVCallWidget##flag ) { \
+ } else { \
+ pWrapper->pVCalls |= Wrapper::pVCallWidgetResize; \
+ ((WidgetWrapper*)pWrapper)->call; \
+ if ( !(pWrapper->pVCalls & Wrapper::pVCallWidget##flag) ) \
+ return; \
+ } \
+ pWrapper->pVCalls &= ~Wrapper::pVCallWidgetResize; \
+ }
+
+#define FLTK3_WRAPPER_VCALLS_OBJECT_INT(proto, call, flag) \
+ virtual int proto { \
+ int ret = 0; \
+ if ( pVCalls & pVCallWidget##flag ) { \
+ } else { \
+ pVCalls |= pVCallWidget##flag; \
+ ret = ((fltk3::Widget*)_p)->call; \
+ pVCalls &= ~pVCallWidget##flag; \
+ } \
+ return ret; \
+ }
+
+#define FLTK3_OBJECT_VCALLS_WRAPPER_INT(call, flag) \
+ if (pWrapper) { \
+ if ( pWrapper->pVCalls & Wrapper::pVCallWidget##flag ) { \
+ } else { \
+ pWrapper->pVCalls |= Wrapper::pVCallWidgetResize; \
+ int ret = ((WidgetWrapper*)pWrapper)->call; \
+ if ( !(pWrapper->pVCalls & Wrapper::pVCallWidget##flag) ) \
+ return ret; \
+ } \
+ pWrapper->pVCalls &= ~Wrapper::pVCallWidgetResize; \
+ }
+
+namespace fltk3 {
+
+/**
+ * \brief a base class for any kind of langage wrapper around FLTK3.
+ */
+ class Wrapper {
+ protected:
+ public:
+ Object *_p;
+ Wrapper()
+ : _p(0L), pVCalls(0) { }
+ virtual ~Wrapper();
+
+ unsigned int pVCalls;
+ static const unsigned int pVCallDtor = 1<<0;
+ static const unsigned int pVCallWidgetDraw = 1<<1;
+ static const unsigned int pVCallWidgetHandle = 1<<2;
+ static const unsigned int pVCallWidgetResize = 1<<3;
+ static const unsigned int pVCallWidgetShow = 1<<4;
+ static const unsigned int pVCallWidgetHide = 1<<5;
+
+ virtual void draw() { /* call _p->draw() with a flag set */ }
+ };
+
+
+ class WidgetWrapper : public Wrapper {
+ public:
+ virtual ~WidgetWrapper() {}
+ FLTK3_WRAPPER_VCALLS_OBJECT(draw(),
+ draw(),
+ Draw)
+ FLTK3_WRAPPER_VCALLS_OBJECT_INT(handle(int event),
+ handle(event),
+ Handle)
+ FLTK3_WRAPPER_VCALLS_OBJECT(resize(int x, int y, int w, int h),
+ resize(x, y, w, h),
+ Resize)
+ FLTK3_WRAPPER_VCALLS_OBJECT(show(),
+ show(),
+ Show)
+ FLTK3_WRAPPER_VCALLS_OBJECT(hide(),
+ hide(),
+ Hide)
+ };
+
+
+}; // namespace fltk3
+
+
+#endif
+
+//
+// End of "$Id: Wrapper.h 7365 2010-03-30 15:18:29Z matt $".
+//
Modified: branches/branch-3.0/fltk3/enumerations.h
===================================================================
--- branches/branch-3.0/fltk3/enumerations.h 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fltk3/enumerations.h 2011-05-17 09:15:40 UTC (rev 8678)
@@ -382,9 +382,9 @@
/*@{*/
- const unsigned int leftMouseButton = 1; ///< The left mouse button
- const unsigned int middleMouseButton = 2; ///< The middle mouse button
- const unsigned int rightMouseButton = 3; ///< The right mouse button
+ const unsigned int LEFT_MOUSE = 1; ///< The left mouse button
+ const unsigned int MIDDLE_MOUSE = 2; ///< The middle mouse button
+ const unsigned int RIGHT_MOUSE = 3; ///< The right mouse button
/*@}*/ // group: Mouse Buttons
@@ -532,16 +532,16 @@
The following standard label types are included:
*/
enum Labeltype { // labeltypes:
- normalLabel = 0, ///< draws the text (0)
- symbolLabel = 0,
- noLabel, ///< does nothing
- shadowLabel, ///< draws a drop shadow under the text
- engravedLabel, ///< draws edges as though the text is engraved
- embossedLabel, ///< draws edges as though the text is raised
- multiLabel, ///< ?
- iconLabel, ///< draws the icon associated with the text
- imageLabel, ///< ?
- freeLabel ///< first free labeltype to use for creating own labeltypes
+ NORMAL_LABEL = 0, ///< draws the text (0)
+ SYMBOL_LABEL = 0,
+ NO_LABEL, ///< does nothing
+ SHADOW_LABEL, ///< draws a drop shadow under the text
+ ENGRAVED_LABEL, ///< draws edges as though the text is engraved
+ EMBOSSED_LABEL, ///< draws edges as though the text is raised
+ MULTI_LABEL, ///< ?
+ ICON_LABEL, ///< draws the icon associated with the text
+ IMAGE_LABEL, ///< ?
+ FREE_LABELTYPE ///< first free labeltype to use for creating own labeltypes
};
@@ -738,22 +738,22 @@
FL_EXPORT Color contrast(Color fg, Color bg);
- FL_EXPORT Color colorAverage(Color c1, Color c2, float weight);
+ FL_EXPORT Color color_average(Color c1, Color c2, float weight);
/** Returns a lighter version of the specified color. */
- inline Color lighter(Color c) { return colorAverage(c, WHITE, .67f); }
+ inline Color lighter(Color c) { return color_average(c, WHITE, .67f); }
/** Returns a darker version of the specified color. */
- inline Color darker(Color c) { return colorAverage(c, BLACK, .67f); }
+ inline Color darker(Color c) { return color_average(c, BLACK, .67f); }
/** Returns the 24-bit color value closest to \p r, \p g, \p b. */
- inline Color rgbColor(uchar r, uchar g, uchar b) {
+ inline Color rgb_color(uchar r, uchar g, uchar b) {
if (!r && !g && !b) return BLACK;
else return (Color)(((((r << 8) | g) << 8) | b) << 8);
}
/** Returns the 24-bit color value closest to \p g (grayscale). */
- inline Color rgbColor(uchar g) {
+ inline Color rgb_color(uchar g) {
if (!g) return BLACK;
else return (Color)(((((g << 8) | g) << 8) | g) << 8);
}
@@ -763,10 +763,10 @@
To get the closest FLTK gray value to an 8-bit grayscale color 'I' use:
\code
- fltk3::grayRamp(I * (fltk3::NUM_GRAY - 1) / 255)
+ fltk3::gray_ramp(I * (fltk3::NUM_GRAY - 1) / 255)
\endcode
*/
- inline Color grayRamp(int i) {return (Color)(i+GRAY_RAMP);}
+ inline Color gray_ramp(int i) {return (Color)(i+GRAY_RAMP);}
/** Returns a color out of the color cube.
Modified: branches/branch-3.0/fltk3/forms.h
===================================================================
--- branches/branch-3.0/fltk3/forms.h 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fltk3/forms.h 2011-05-17 09:15:40 UTC (rev 8678)
@@ -129,9 +129,9 @@
#define fltk3::TIMESBOLDITALIC_STYLE fltk3::TIMES_BOLD_ITALIC
// hacks to change the labeltype() when passed to fl_set_object_lstyle():
-#define fltk3::SHADOW_STYLE (fltk3::shadowLabel<<8)
-#define FL_ENGRAVED_STYLE (fltk3::engravedLabel<<8)
-#define FL_EMBOSSED_STYLE (fltk3::embossedLabel<<0)
+#define fltk3::SHADOW_STYLE (fltk3::SHADOW_LABEL<<8)
+#define FL_ENGRAVED_STYLE (fltk3::ENGRAVED_LABEL<<8)
+#define FL_EMBOSSED_STYLE (fltk3::EMBOSSED_LABEL<<0)
// size values are different from XForms, match older Forms:
#define FL_TINY_SIZE 8
Modified: branches/branch-3.0/fltk3/run.h
===================================================================
--- branches/branch-3.0/fltk3/run.h 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fltk3/run.h 2011-05-17 09:15:40 UTC (rev 8678)
@@ -568,7 +568,7 @@
/**
Gets which particular mouse button caused the current event.
This returns garbage if the most recent event was not a fltk3::PUSH or fltk3::RELEASE event.
- \retval fltk3::leftMouseButton \retval fltk3::middleMouseButton \retval fltk3::rightMouseButton.
+ \retval fltk3::LEFT_MOUSE \retval fltk3::MIDDLE_MOUSE \retval fltk3::RIGHT_MOUSE.
\see Fl::event_buttons()
*/
static int event_button() {return e_keysym-fltk3::MouseButton;}
Modified: branches/branch-3.0/fluid/Fl_Menu_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fluid/Fl_Menu_Type.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -287,14 +287,14 @@
void Fl_Menu_Item_Type::write_item() {
static const char * const labeltypes[] = {
- "fltk3::normalLabel",
- "fltk3::noLabel",
- "fltk3::shadowLabel",
- "fltk3::engravedLabel",
- "fltk3::embossedLabel",
- "fltk3::multiLabel",
- "fltk3::iconLabel",
- "fltk3::imageLabel"
+ "fltk3::NORMAL_LABEL",
+ "fltk3::NO_LABEL",
+ "fltk3::SHADOW_LABEL",
+ "fltk3::ENGRAVED_LABEL",
+ "fltk3::EMBOSSED_LABEL",
+ "fltk3::MULTI_LABEL",
+ "fltk3::ICON_LABEL",
+ "fltk3::IMAGE_LABEL"
};
write_c(" {");
Modified: branches/branch-3.0/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -1025,10 +1025,10 @@
Fl_Menu_Item labeltypemenu[] = {
{"NORMAL_LABEL",0,0,(void*)0},
- {"SHADOW_LABEL",0,0,(void*)fltk3::shadowLabel},
- {"ENGRAVED_LABEL",0,0,(void*)fltk3::engravedLabel},
- {"EMBOSSED_LABEL",0,0,(void*)fltk3::embossedLabel},
- {"NO_LABEL",0,0,(void*)(fltk3::noLabel)},
+ {"SHADOW_LABEL",0,0,(void*)fltk3::SHADOW_LABEL},
+ {"ENGRAVED_LABEL",0,0,(void*)fltk3::ENGRAVED_LABEL},
+ {"EMBOSSED_LABEL",0,0,(void*)fltk3::EMBOSSED_LABEL},
+ {"NO_LABEL",0,0,(void*)(fltk3::NO_LABEL)},
{0}};
void labeltype_cb(Fl_Choice* i, void *v) {
Modified: branches/branch-3.0/fluid/alignment_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/alignment_panel.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fluid/alignment_panel.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -49,9 +49,9 @@
Fl_Choice *i18n_type_chooser=(Fl_Choice *)0;
Fl_Menu_Item menu_i18n_type_chooser[] = {
- {"None", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
- {"GNU gettext", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
- {"POSIX catgets", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
+ {"None", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"GNU gettext", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"POSIX catgets", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -158,10 +158,10 @@
Fl_Choice *scheme_choice=(Fl_Choice *)0;
Fl_Menu_Item menu_scheme_choice[] = {
- {"Default", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
- {"None", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
- {"Plastic", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
- {"GTK+", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
+ {"Default", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"None", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"Plastic", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"GTK+", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -595,9 +595,9 @@
}
Fl_Menu_Item menu_wVisibleFocus[] = {
- {"off", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 14, 0},
- {"on", 0, 0, (void*)(1), 128, fltk3::normalLabel, 0, 14, 0},
- {"default", 0, 0, (void*)(2), 0, fltk3::normalLabel, 0, 14, 0},
+ {"off", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"on", 0, 0, (void*)(1), 128, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"default", 0, 0, (void*)(2), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -609,9 +609,9 @@
}
Fl_Menu_Item menu_wArrowFocus[] = {
- {"off", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 14, 0},
- {"on", 0, 0, (void*)(1), 128, fltk3::normalLabel, 0, 14, 0},
- {"default", 0, 0, (void*)(2), 0, fltk3::normalLabel, 0, 14, 0},
+ {"off", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"on", 0, 0, (void*)(1), 128, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"default", 0, 0, (void*)(2), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -623,9 +623,9 @@
}
Fl_Menu_Item menu_wShowTooltips[] = {
- {"off", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 14, 0},
- {"on", 0, 0, (void*)(1), 128, fltk3::normalLabel, 0, 14, 0},
- {"default", 0, 0, (void*)(2), 0, fltk3::normalLabel, 0, 14, 0},
+ {"off", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"on", 0, 0, (void*)(1), 128, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"default", 0, 0, (void*)(2), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -637,9 +637,9 @@
}
Fl_Menu_Item menu_wDNDText[] = {
- {"off", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 14, 0},
- {"on", 0, 0, (void*)(1), 128, fltk3::normalLabel, 0, 14, 0},
- {"default", 0, 0, (void*)(2), 0, fltk3::normalLabel, 0, 14, 0},
+ {"off", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"on", 0, 0, (void*)(1), 128, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"default", 0, 0, (void*)(2), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -650,8 +650,8 @@
}
Fl_Menu_Item menu_wUserOrSystem[] = {
- {"User Settings", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 14, 0},
- {"System Settings", 0, 0, (void*)(1), 0, fltk3::normalLabel, 0, 14, 0},
+ {"User Settings", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"System Settings", 0, 0, (void*)(1), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
Modified: branches/branch-3.0/fluid/factory.cxx
===================================================================
--- branches/branch-3.0/fluid/factory.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fluid/factory.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -1094,7 +1094,7 @@
ml->labela = (char*)ic;
ml->labelb = t1;
ml->typea = _FL_IMAGE_LABEL;
- ml->typeb = fltk3::normalLabel;
+ ml->typeb = fltk3::NORMAL_LABEL;
ml->label( mi );
}
else if (txt!=mi->text)
Modified: branches/branch-3.0/fluid/fluid.cxx
===================================================================
--- branches/branch-3.0/fluid/fluid.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fluid/fluid.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -1708,12 +1708,12 @@
{"&Vertical",0,(Fl_Callback *)align_widget_cb,(void*)41},
{0},
{"Set &Widget Size",0,0,0,FL_SUBMENU|FL_MENU_DIVIDER},
- {"&Tiny",fltk3::ALT+'1',(Fl_Callback *)widget_size_cb,(void*)8,0,fltk3::normalLabel,fltk3::HELVETICA,8},
- {"&Small",fltk3::ALT+'2',(Fl_Callback *)widget_size_cb,(void*)11,0,fltk3::normalLabel,fltk3::HELVETICA,11},
- {"&Normal",fltk3::ALT+'3',(Fl_Callback *)widget_size_cb,(void*)14,0,fltk3::normalLabel,fltk3::HELVETICA,14},
- {"&Medium",fltk3::ALT+'4',(Fl_Callback *)widget_size_cb,(void*)18,0,fltk3::normalLabel,fltk3::HELVETICA,18},
- {"&Large",fltk3::ALT+'5',(Fl_Callback *)widget_size_cb,(void*)24,0,fltk3::normalLabel,fltk3::HELVETICA,24},
- {"&Huge",fltk3::ALT+'6',(Fl_Callback *)widget_size_cb,(void*)32,0,fltk3::normalLabel,fltk3::HELVETICA,32},
+ {"&Tiny",fltk3::ALT+'1',(Fl_Callback *)widget_size_cb,(void*)8,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,8},
+ {"&Small",fltk3::ALT+'2',(Fl_Callback *)widget_size_cb,(void*)11,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,11},
+ {"&Normal",fltk3::ALT+'3',(Fl_Callback *)widget_size_cb,(void*)14,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,14},
+ {"&Medium",fltk3::ALT+'4',(Fl_Callback *)widget_size_cb,(void*)18,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,18},
+ {"&Large",fltk3::ALT+'5',(Fl_Callback *)widget_size_cb,(void*)24,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,24},
+ {"&Huge",fltk3::ALT+'6',(Fl_Callback *)widget_size_cb,(void*)32,0,fltk3::NORMAL_LABEL,fltk3::HELVETICA,32},
{0},
{"&Grid and Size Settings...",fltk3::COMMAND+'g',show_grid_cb},
{0},
Modified: branches/branch-3.0/fluid/function_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/function_panel.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fluid/function_panel.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -42,17 +42,17 @@
Fl_Choice *f_public_member_choice=(Fl_Choice *)0;
Fl_Menu_Item menu_f_public_member_choice[] = {
- {"private", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 11, 0},
- {"public", 0, 0, (void*)(1), 0, fltk3::normalLabel, 0, 11, 0},
- {"protected", 0, 0, (void*)(2), 0, fltk3::normalLabel, 0, 11, 0},
+ {"private", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"public", 0, 0, (void*)(1), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"protected", 0, 0, (void*)(2), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
Fl_Choice *f_public_choice=(Fl_Choice *)0;
Fl_Menu_Item menu_f_public_choice[] = {
- {"local", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 11, 0},
- {"global", 0, 0, (void*)(1), 0, fltk3::normalLabel, 0, 11, 0},
+ {"local", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"global", 0, 0, (void*)(1), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -162,7 +162,7 @@
code_input->box(fltk3::DOWN_BOX);
code_input->color(fltk3::BACKGROUND2_COLOR);
code_input->selection_color(fltk3::SELECTION_COLOR);
- code_input->labeltype(fltk3::normalLabel);
+ code_input->labeltype(fltk3::NORMAL_LABEL);
code_input->labelfont(0);
code_input->labelsize(11);
code_input->labelcolor(fltk3::FOREGROUND_COLOR);
@@ -252,8 +252,8 @@
Fl_Choice *declblock_public_choice=(Fl_Choice *)0;
Fl_Menu_Item menu_declblock_public_choice[] = {
- {"in source code only", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 11, 0},
- {"in header and source", 0, 0, (void*)(1), 0, fltk3::normalLabel, 0, 11, 0},
+ {"in source code only", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"in header and source", 0, 0, (void*)(1), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -333,19 +333,19 @@
Fl_Choice *decl_choice=(Fl_Choice *)0;
Fl_Menu_Item menu_decl_choice[] = {
- {"in source file only", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
- {"in header file only", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
- {"\"static\" in source file", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
- {"in source and \"extern\" in header", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
+ {"in source file only", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"in header file only", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"\"static\" in source file", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"in source and \"extern\" in header", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
Fl_Choice *decl_class_choice=(Fl_Choice *)0;
Fl_Menu_Item menu_decl_class_choice[] = {
- {"private", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
- {"public", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
- {"protected", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
+ {"private", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"public", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"protected", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -425,19 +425,19 @@
Fl_Choice *data_choice=(Fl_Choice *)0;
Fl_Menu_Item menu_data_choice[] = {
- {"in source file only", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
- {"in header file only", 0, 0, 0, 16, fltk3::normalLabel, 0, 11, 0},
- {"\"static\" in source file", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
- {"in source and \"extern\" in header", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
+ {"in source file only", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"in header file only", 0, 0, 0, 16, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"\"static\" in source file", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"in source and \"extern\" in header", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
Fl_Choice *data_class_choice=(Fl_Choice *)0;
Fl_Menu_Item menu_data_class_choice[] = {
- {"private", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
- {"public", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
- {"protected", 0, 0, 0, 0, fltk3::normalLabel, 0, 11, 0},
+ {"private", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"public", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"protected", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -629,7 +629,7 @@
comment_input->box(fltk3::DOWN_BOX);
comment_input->color(fltk3::BACKGROUND2_COLOR);
comment_input->selection_color(fltk3::SELECTION_COLOR);
- comment_input->labeltype(fltk3::normalLabel);
+ comment_input->labeltype(fltk3::NORMAL_LABEL);
comment_input->labelfont(0);
comment_input->labelsize(11);
comment_input->labelcolor(fltk3::FOREGROUND_COLOR);
@@ -1083,7 +1083,7 @@
sv_source->box(fltk3::DOWN_FRAME);
sv_source->color(fltk3::BACKGROUND2_COLOR);
sv_source->selection_color(fltk3::SELECTION_COLOR);
- sv_source->labeltype(fltk3::normalLabel);
+ sv_source->labeltype(fltk3::NORMAL_LABEL);
sv_source->labelfont(0);
sv_source->labelsize(14);
sv_source->labelcolor(fltk3::FOREGROUND_COLOR);
@@ -1102,7 +1102,7 @@
sv_header->box(fltk3::DOWN_FRAME);
sv_header->color(fltk3::BACKGROUND2_COLOR);
sv_header->selection_color(fltk3::SELECTION_COLOR);
- sv_header->labeltype(fltk3::normalLabel);
+ sv_header->labeltype(fltk3::NORMAL_LABEL);
sv_header->labelfont(0);
sv_header->labelsize(14);
sv_header->labelcolor(fltk3::FOREGROUND_COLOR);
Modified: branches/branch-3.0/fluid/print_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/print_panel.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fluid/print_panel.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -117,8 +117,8 @@
Fl_Choice *print_page_size=(Fl_Choice *)0;
Fl_Menu_Item menu_print_page_size[] = {
- {"Letter", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
- {"A4", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
+ {"Letter", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"A4", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
Modified: branches/branch-3.0/fluid/widget_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/widget_panel.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/fluid/widget_panel.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -34,31 +34,31 @@
}
Fl_Menu_Item menu_[] = {
- {" Image Alignment ", 0, 0, (void*)(0xFFFFFFFF), 1, fltk3::normalLabel, 2, 11, 0},
- {"image over text", 0, 0, (void*)(fltk3::ALIGN_IMAGE_OVER_TEXT), 0, fltk3::normalLabel, 0, 11, 0},
- {"text over image", 0, 0, (void*)(fltk3::ALIGN_TEXT_OVER_IMAGE), 0, fltk3::normalLabel, 0, 11, 0},
- {"text next to image", 0, 0, (void*)(fltk3::ALIGN_TEXT_NEXT_TO_IMAGE), 0, fltk3::normalLabel, 0, 11, 0},
- {"image next to text", 0, 0, (void*)(fltk3::ALIGN_IMAGE_NEXT_TO_TEXT), 0, fltk3::normalLabel, 0, 11, 0},
- {"image is backdrop", 0, 0, (void*)(fltk3::ALIGN_IMAGE_BACKDROP), 0, fltk3::normalLabel, 0, 11, 0},
+ {" Image Alignment ", 0, 0, (void*)(0xFFFFFFFF), 1, fltk3::NORMAL_LABEL, 2, 11, 0},
+ {"image over text", 0, 0, (void*)(fltk3::ALIGN_IMAGE_OVER_TEXT), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"text over image", 0, 0, (void*)(fltk3::ALIGN_TEXT_OVER_IMAGE), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"text next to image", 0, 0, (void*)(fltk3::ALIGN_TEXT_NEXT_TO_IMAGE), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"image next to text", 0, 0, (void*)(fltk3::ALIGN_IMAGE_NEXT_TO_TEXT), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"image is backdrop", 0, 0, (void*)(fltk3::ALIGN_IMAGE_BACKDROP), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
Fl_Menu_Item menu_1[] = {
- {" Inside && Outside ", 0, 0, (void*)(0xFFFFFFFF), 1, fltk3::normalLabel, 2, 11, 0},
- {"top left", 0, 0, (void*)(fltk3::ALIGN_TOP_LEFT), 0, fltk3::normalLabel, 0, 11, 0},
- {"top", 0, 0, (void*)(fltk3::ALIGN_TOP), 0, fltk3::normalLabel, 0, 11, 0},
- {"top right", 0, 0, (void*)(fltk3::ALIGN_TOP_RIGHT), 0, fltk3::normalLabel, 0, 11, 0},
- {"left", 0, 0, (void*)(fltk3::ALIGN_LEFT), 0, fltk3::normalLabel, 0, 11, 0},
- {"center", 0, 0, (void*)(fltk3::ALIGN_CENTER), 0, fltk3::normalLabel, 0, 11, 0},
- {"right", 0, 0, (void*)(fltk3::ALIGN_RIGHT), 0, fltk3::normalLabel, 0, 11, 0},
- {"bottom left", 0, 0, (void*)(fltk3::ALIGN_BOTTOM_LEFT), 0, fltk3::normalLabel, 0, 11, 0},
- {"bottom", 0, 0, (void*)(fltk3::ALIGN_BOTTOM), 0, fltk3::normalLabel, 0, 11, 0},
- {"bottom right", 0, 0, (void*)(fltk3::ALIGN_BOTTOM_RIGHT), 128, fltk3::normalLabel, 0, 11, 0},
- {" Outside Alignment ", 0, 0, (void*)(0xFFFFFFFF), 1, fltk3::normalLabel, 2, 11, 0},
- {"left top", 0, 0, (void*)(fltk3::ALIGN_LEFT_TOP), 0, fltk3::normalLabel, 0, 11, 0},
- {"right top", 0, 0, (void*)(fltk3::ALIGN_RIGHT_TOP), 0, fltk3::normalLabel, 0, 11, 0},
- {"left bottom", 0, 0, (void*)(fltk3::ALIGN_LEFT_BOTTOM), 0, fltk3::normalLabel, 0, 11, 0},
- {"right bottom", 0, 0, (void*)(fltk3::ALIGN_RIGHT_BOTTOM), 0, fltk3::normalLabel, 0, 11, 0},
+ {" Inside && Outside ", 0, 0, (void*)(0xFFFFFFFF), 1, fltk3::NORMAL_LABEL, 2, 11, 0},
+ {"top left", 0, 0, (void*)(fltk3::ALIGN_TOP_LEFT), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"top", 0, 0, (void*)(fltk3::ALIGN_TOP), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"top right", 0, 0, (void*)(fltk3::ALIGN_TOP_RIGHT), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"left", 0, 0, (void*)(fltk3::ALIGN_LEFT), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"center", 0, 0, (void*)(fltk3::ALIGN_CENTER), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"right", 0, 0, (void*)(fltk3::ALIGN_RIGHT), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"bottom left", 0, 0, (void*)(fltk3::ALIGN_BOTTOM_LEFT), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"bottom", 0, 0, (void*)(fltk3::ALIGN_BOTTOM), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"bottom right", 0, 0, (void*)(fltk3::ALIGN_BOTTOM_RIGHT), 128, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {" Outside Alignment ", 0, 0, (void*)(0xFFFFFFFF), 1, fltk3::NORMAL_LABEL, 2, 11, 0},
+ {"left top", 0, 0, (void*)(fltk3::ALIGN_LEFT_TOP), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"right top", 0, 0, (void*)(fltk3::ALIGN_RIGHT_TOP), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"left bottom", 0, 0, (void*)(fltk3::ALIGN_LEFT_BOTTOM), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"right bottom", 0, 0, (void*)(fltk3::ALIGN_RIGHT_BOTTOM), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -71,15 +71,15 @@
Fl_Value_Input *widget_h_input=(Fl_Value_Input *)0;
Fl_Menu_Item menu_2[] = {
- {"private", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 11, 0},
- {"public", 0, 0, (void*)(1), 0, fltk3::normalLabel, 0, 11, 0},
- {"protected", 0, 0, (void*)(2), 0, fltk3::normalLabel, 0, 11, 0},
+ {"private", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"public", 0, 0, (void*)(1), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"protected", 0, 0, (void*)(2), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
Fl_Menu_Item menu_3[] = {
- {"local", 0, 0, (void*)(0), 0, fltk3::normalLabel, 0, 11, 0},
- {"global", 0, 0, (void*)(1), 0, fltk3::normalLabel, 0, 11, 0},
+ {"local", 0, 0, (void*)(0), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
+ {"global", 0, 0, (void*)(1), 0, fltk3::NORMAL_LABEL, 0, 11, 0},
{0,0,0,0,0,0,0,0,0}
};
@@ -413,7 +413,7 @@
o->box(fltk3::DOWN_BOX);
o->color(fltk3::BACKGROUND2_COLOR);
o->selection_color(fltk3::BACKGROUND2_COLOR);
- o->labeltype(fltk3::normalLabel);
+ o->labeltype(fltk3::NORMAL_LABEL);
o->labelfont(1);
o->labelsize(11);
o->labelcolor(fltk3::FOREGROUND_COLOR);
@@ -724,7 +724,7 @@
o->box(fltk3::DOWN_BOX);
o->color(fltk3::BACKGROUND2_COLOR);
o->selection_color(fltk3::SELECTION_COLOR);
- o->labeltype(fltk3::normalLabel);
+ o->labeltype(fltk3::NORMAL_LABEL);
o->labelfont(1);
o->labelsize(11);
o->labelcolor(fltk3::FOREGROUND_COLOR);
Modified: branches/branch-3.0/make3.sh
===================================================================
--- branches/branch-3.0/make3.sh 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/make3.sh 2011-05-17 09:15:40 UTC (rev 8678)
@@ -74,9 +74,9 @@
renameMacro FL_Alt_R AltRKey
renameMacro FL_Delete DeleteKey
-renameMacro FL_LEFT_MOUSE leftMouseButton
-renameMacro FL_MIDDLE_MOUSE middleMouseButton
-renameMacro FL_RIGHT_MOUSE rightMouseButton
+renameMacro FL_LEFT_MOUSE LEFT_MOUSE
+renameMacro FL_MIDDLE_MOUSE MIDDLE_MOUSE
+renameMacro FL_RIGHT_MOUSE RIGHT_MOUSE
renameMacro FL_SHIFT SHIFT
renameMacro FL_CAPS_LOCK CAPS_LOCK
@@ -130,15 +130,15 @@
renameEnum FL_ALIGN_* ALIGN_
renameEnumType Fl_Labeltype Labeltype
-renameEnum FL_NORMAL_LABEL normalLabel
-renameEnum FL_SYMBOL_LABEL symbolLabel
-renameEnum FL_NO_LABEL noLabel
-renameEnum FL_SHADOW_LABEL shadowLabel
-renameEnum FL_ENGRAVED_LABEL engravedLabel
-renameEnum FL_EMBOSSED_LABEL embossedLabel
-renameEnum FL_MULTI_LABEL multiLabel
-renameEnum FL_ICON_LABEL iconLabel
-renameEnum FL_IMAGE_LABLE imageLabel
+renameEnum FL_NORMAL_LABEL NORMAL_LABEL
+renameEnum FL_SYMBOL_LABEL SYMBOL_LABEL
+renameEnum FL_NO_LABEL NO_LABEL
+renameEnum FL_SHADOW_LABEL SHADOW_LABEL
+renameEnum FL_ENGRAVED_LABEL ENGRAVED_LABEL
+renameEnum FL_EMBOSSED_LABEL EMBOSSED_LABEL
+renameEnum FL_MULTI_LABEL MULTI_LABEL
+renameEnum FL_ICON_LABEL ICON_LABEL
+renameEnum FL_IMAGE_LABEL IMAGE_LABEL
renameEnum FL_FREE_LABELTYPE freeLabel
rename Fl_Font Font
@@ -225,11 +225,11 @@
rename FL_NUM_BLUE NUM_BLUE
rename fl_inactive inactive
rename fl_contrast contrast
-rename fl_color_average colorAverage
+rename fl_color_average color_average
rename fl_lighter lighter
rename fl_darker darker
-rename fl_rgb_color rgbColor
-rename fl_gray_ramp grayRamp
+rename fl_rgb_color rgb_color
+rename fl_gray_ramp gray_ramp
renameClass Fl_Widget Widget
renameClass Fl_Group Group
Modified: branches/branch-3.0/src/Fl.cxx
===================================================================
--- branches/branch-3.0/src/Fl.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -935,8 +935,8 @@
fltk3::Widget* w = fl_xfocus;
if (w) {
int saved = Fl::e_keysym;
- if (Fl::e_keysym < (fltk3::MouseButton + fltk3::leftMouseButton) ||
- Fl::e_keysym > (fltk3::MouseButton + fltk3::rightMouseButton))
+ if (Fl::e_keysym < (fltk3::MouseButton + fltk3::LEFT_MOUSE) ||
+ Fl::e_keysym > (fltk3::MouseButton + fltk3::RIGHT_MOUSE))
Fl::e_keysym = 0; // make sure widgets don't think a keystroke moved focus
while (w->parent()) w = w->parent();
if (Fl::modal()) w = Fl::modal();
Modified: branches/branch-3.0/src/Fl_Bitmap.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Bitmap.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Bitmap.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -321,7 +321,7 @@
r = 255-r;
g = 255-g;
b = 255-b;
- fltk3::Color background = fltk3::rgbColor(r, g, b); // a color very different from the bitmap's
+ fltk3::Color background = fltk3::rgb_color(r, g, b); // a color very different from the bitmap's
fl_color(background);
fl_rectf(0,0,W,H); // use this color as offscreen background
fl_color(save_c); // back to bitmap's color
@@ -395,8 +395,8 @@
}
void Fl_Bitmap::label(Fl_Menu_Item* m) {
- Fl::set_labeltype(fltk3::imageLabel, labeltype, measure);
- m->label(fltk3::imageLabel, (const char*)this);
+ Fl::set_labeltype(fltk3::IMAGE_LABEL, labeltype, measure);
+ m->label(fltk3::IMAGE_LABEL, (const char*)this);
}
Fl_Image *Fl_Bitmap::copy(int W, int H) {
Modified: branches/branch-3.0/src/Fl_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Button.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Button.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -77,7 +77,7 @@
fltk3::Color col = value() ? selection_color() : color();
draw_box(value() ? (down_box()?down_box():fltk3::down(box())) : box(), col);
draw_backdrop();
- if (labeltype() == fltk3::normalLabel && value()) {
+ if (labeltype() == fltk3::NORMAL_LABEL && value()) {
fltk3::Color c = labelcolor();
labelcolor(fltk3::contrast(c, col));
draw_label();
Modified: branches/branch-3.0/src/Fl_Clock.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Clock.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Clock.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -80,7 +80,7 @@
*/
void Fl_Clock_Output::draw(int X, int Y, int W, int H) {
fltk3::Color box_color = type()==FL_ROUND_CLOCK ? fltk3::GRAY : color();
- fltk3::Color shadow_color = fltk3::colorAverage(box_color, fltk3::BLACK, 0.5);
+ fltk3::Color shadow_color = fltk3::color_average(box_color, fltk3::BLACK, 0.5);
draw_box(box(), X, Y, W, H, box_color);
fl_push_matrix();
fl_translate(X+W/2.0-.5, Y+H/2.0-.5);
@@ -157,7 +157,7 @@
Fl_Clock_Output::Fl_Clock_Output(int X, int Y, int W, int H, const char *L)
: fltk3::Widget(X, Y, W, H, L) {
box(fltk3::UP_BOX);
- selection_color(fltk3::grayRamp(5));
+ selection_color(fltk3::gray_ramp(5));
align(fltk3::ALIGN_BOTTOM);
hour_ = 0;
minute_ = 0;
Modified: branches/branch-3.0/src/Fl_File_Icon.cxx
===================================================================
--- branches/branch-3.0/src/Fl_File_Icon.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_File_Icon.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -458,7 +458,7 @@
*/
void Fl_File_Icon::label(fltk3::Widget *w) // I - Widget to label
{
- w->label(fltk3::iconLabel, (const char*)this);
+ w->label(fltk3::ICON_LABEL, (const char*)this);
}
Modified: branches/branch-3.0/src/Fl_File_Icon2.cxx
===================================================================
--- branches/branch-3.0/src/Fl_File_Icon2.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_File_Icon2.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -257,7 +257,7 @@
{
// Composite color; compute average...
c = -c;
- add_color(fltk3::colorAverage((fltk3::Color)(c >> 4),
+ add_color(fltk3::color_average((fltk3::Color)(c >> 4),
(fltk3::Color)(c & 15), 0.5f));
}
else
@@ -296,7 +296,7 @@
{
// Composite color; compute average...
c = -c;
- cval = fltk3::colorAverage((fltk3::Color)(c >> 4), (fltk3::Color)(c & 15), 0.5f);
+ cval = fltk3::color_average((fltk3::Color)(c >> 4), (fltk3::Color)(c & 15), 0.5f);
}
else
cval = c;
@@ -373,20 +373,20 @@
switch (img->d())
{
case 1 :
- temp = fltk3::rgbColor(row[0], row[0], row[0]);
+ temp = fltk3::rgb_color(row[0], row[0], row[0]);
break;
case 2 :
if (row[1] > 127)
- temp = fltk3::rgbColor(row[0], row[0], row[0]);
+ temp = fltk3::rgb_color(row[0], row[0], row[0]);
else
temp = (fltk3::Color)-1;
break;
case 3 :
- temp = fltk3::rgbColor(row[0], row[1], row[2]);
+ temp = fltk3::rgb_color(row[0], row[1], row[2]);
break;
default :
if (row[3] > 127)
- temp = fltk3::rgbColor(row[0], row[1], row[2]);
+ temp = fltk3::rgb_color(row[0], row[1], row[2]);
else
temp = (fltk3::Color)-1;
break;
@@ -456,7 +456,7 @@
ncolors = -ncolors;
for (i = 0, cmapptr = (const uchar *)*ptr; i < ncolors; i ++, cmapptr += 4)
- colors[cmapptr[0]] = fltk3::rgbColor(cmapptr[1], cmapptr[2], cmapptr[3]);
+ colors[cmapptr[0]] = fltk3::rgb_color(cmapptr[1], cmapptr[2], cmapptr[3]);
ptr ++;
} else {
@@ -521,7 +521,7 @@
break;
}
- colors[ch] = fltk3::rgbColor((uchar)red, (uchar)green, (uchar)blue);
+ colors[ch] = fltk3::rgb_color((uchar)red, (uchar)green, (uchar)blue);
} else {
// Read a color name...
if (strncasecmp(lineptr + 2, "white", 5) == 0) colors[ch] = fltk3::WHITE;
Modified: branches/branch-3.0/src/Fl_Help_View.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Help_View.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Help_View.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -2550,11 +2550,11 @@
g = ((rgb >> 4) & 15) * 17;
b = (rgb & 15) * 17;
}
- return (fltk3::rgbColor((uchar)r, (uchar)g, (uchar)b));
+ return (fltk3::rgb_color((uchar)r, (uchar)g, (uchar)b));
} else {
for (i = 0; i < (int)(sizeof(colors) / sizeof(colors[0])); i ++)
if (!strcasecmp(n, colors[i].name)) {
- return fltk3::rgbColor(colors[i].r, colors[i].g, colors[i].b);
+ return fltk3::rgb_color(colors[i].r, colors[i].g, colors[i].b);
}
return c;
}
Modified: branches/branch-3.0/src/Fl_Image.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Image.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Image.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -127,8 +127,8 @@
instead.
*/
void Fl_Image::label(Fl_Menu_Item* m) {
- Fl::set_labeltype(fltk3::imageLabel, labeltype, measure);
- m->label(fltk3::imageLabel, (const char*)this);
+ Fl::set_labeltype(fltk3::IMAGE_LABEL, labeltype, measure);
+ m->label(fltk3::IMAGE_LABEL, (const char*)this);
}
void
@@ -581,7 +581,7 @@
}
void Fl_RGB_Image::label(Fl_Menu_Item* m) {
- m->label(fltk3::imageLabel, (const char*)this);
+ m->label(fltk3::IMAGE_LABEL, (const char*)this);
}
Modified: branches/branch-3.0/src/Fl_Light_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Light_Button.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Light_Button.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -90,7 +90,7 @@
tW --;
fl_pie(x() + tdx - 1, y() + tdy - 1, tW + 3, tW + 3, 0.0, 360.0);
fl_arc(x() + tdx - 1, y() + tdy - 1, tW + 3, tW + 3, 0.0, 360.0);
- fl_color(fltk3::colorAverage(fltk3::WHITE, fltk3::SELECTION_COLOR, 0.2f));
+ fl_color(fltk3::color_average(fltk3::WHITE, fltk3::SELECTION_COLOR, 0.2f));
} else fl_color(col);
switch (tW) {
@@ -120,7 +120,7 @@
}
if (Fl::scheme() && !strcmp(Fl::scheme(), "gtk+")) {
- fl_color(fltk3::colorAverage(fltk3::WHITE, fltk3::SELECTION_COLOR, 0.5));
+ fl_color(fltk3::color_average(fltk3::WHITE, fltk3::SELECTION_COLOR, 0.5));
fl_arc(x() + tdx, y() + tdy, tW + 1, tW + 1, 60.0, 180.0);
}
}
@@ -137,7 +137,7 @@
if (w()<ww+2*xx) xx = (w()-ww)/2;
if (Fl::scheme() && !strcmp(Fl::scheme(), "plastic")) {
col = active_r() ? selection_color() : fltk3::inactive(selection_color());
- fl_color(value() ? col : fltk3::colorAverage(col, fltk3::BLACK, 0.5f));
+ fl_color(value() ? col : fltk3::color_average(col, fltk3::BLACK, 0.5f));
fl_pie(x()+xx, y()+dy+1, ww, hh, 0, 360);
} else {
draw_box(fltk3::THIN_DOWN_BOX, x()+xx, y()+dy+1, ww, hh, col);
Modified: branches/branch-3.0/src/Fl_Menu.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Menu.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Menu.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -207,7 +207,7 @@
tW --;
fl_pie(x + td + 1, y + d + td - 1, tW + 3, tW + 3, 0.0, 360.0);
fl_arc(x + td + 1, y + d + td - 1, tW + 3, tW + 3, 0.0, 360.0);
- fl_color(fltk3::colorAverage(fltk3::WHITE, fltk3::SELECTION_COLOR, 0.2f));
+ fl_color(fltk3::color_average(fltk3::WHITE, fltk3::SELECTION_COLOR, 0.2f));
} else fl_color(labelcolor_);
} else fl_color(labelcolor_);
@@ -238,7 +238,7 @@
}
if (Fl::scheme() && !strcmp(Fl::scheme(), "gtk+")) {
- fl_color(fltk3::colorAverage(fltk3::WHITE, fltk3::SELECTION_COLOR, 0.5));
+ fl_color(fltk3::color_average(fltk3::WHITE, fltk3::SELECTION_COLOR, 0.5));
fl_arc(x + td + 2, y + d + td, tW + 1, tW + 1, 60.0, 180.0);
}
}
@@ -277,7 +277,7 @@
clear_border();
set_menu_window();
menu = L;
- if (L->labelcolor_ || Fl::scheme() || L->labeltype_ > fltk3::noLabel) clear_overlay();
+ if (L->labelcolor_ || Fl::scheme() || L->labeltype_ > fltk3::NO_LABEL) clear_overlay();
}
menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp,
@@ -356,7 +356,7 @@
}
}
}
- if (m->labelcolor_ || Fl::scheme() || m->labeltype_ > fltk3::noLabel) clear_overlay();
+ if (m->labelcolor_ || Fl::scheme() || m->labeltype_ > fltk3::NO_LABEL) clear_overlay();
}
shortcutWidth = hotKeysw;
if (selected >= 0 && !Wp) X -= W/2;
Modified: branches/branch-3.0/src/Fl_Multi_Label.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Multi_Label.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Multi_Label.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -66,13 +66,13 @@
}
void Fl_Multi_Label::label(fltk3::Widget* o) {
- Fl::set_labeltype(fltk3::multiLabel, multi_labeltype, multi_measure);
- o->label(fltk3::multiLabel, (const char*)this);
+ Fl::set_labeltype(fltk3::MULTI_LABEL, multi_labeltype, multi_measure);
+ o->label(fltk3::MULTI_LABEL, (const char*)this);
}
void Fl_Multi_Label::label(Fl_Menu_Item* o) {
- Fl::set_labeltype(fltk3::multiLabel, multi_labeltype, multi_measure);
- o->label(fltk3::multiLabel, (const char*)this);
+ Fl::set_labeltype(fltk3::MULTI_LABEL, multi_labeltype, multi_measure);
+ o->label(fltk3::MULTI_LABEL, (const char*)this);
}
//
Modified: branches/branch-3.0/src/Fl_Pixmap.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Pixmap.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Pixmap.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -259,7 +259,7 @@
}
void Fl_Pixmap::label(Fl_Menu_Item* m) {
- m->label(fltk3::imageLabel, (const char*)this);
+ m->label(fltk3::IMAGE_LABEL, (const char*)this);
}
void Fl_Pixmap::copy_data() {
Modified: branches/branch-3.0/src/Fl_PostScript.cxx
===================================================================
--- branches/branch-3.0/src/Fl_PostScript.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_PostScript.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -984,7 +984,7 @@
}
void Fl_PostScript_Graphics_Driver::color(unsigned char r, unsigned char g, unsigned char b) {
- Fl_Graphics_Driver::color( fltk3::rgbColor(r, g, b) );
+ Fl_Graphics_Driver::color( fltk3::rgb_color(r, g, b) );
cr_ = r; cg_ = g; cb_ = b;
if (r == g && g == b) {
double gray = r/255.0;
Modified: branches/branch-3.0/src/Fl_Return_Button.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Return_Button.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Return_Button.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -40,7 +40,7 @@
fl_line(x0, y0, x1, y0+d);
fl_yxline(x1, y0+d, y0+t, x1+d+2*t, y0-d);
fl_yxline(x1, y0-t, y0-d);
- fl_color(fltk3::grayRamp(0));
+ fl_color(fltk3::gray_ramp(0));
fl_line(x0, y0, x1, y0-d);
fl_color(fltk3::DARK3);
fl_xyline(x1+1, y0-t, x1+d, y0-d, x1+d+2*t);
Modified: branches/branch-3.0/src/Fl_Scrollbar.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Scrollbar.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Scrollbar.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -107,7 +107,7 @@
if (val >= 1.0) sliderx = ww-S;
else if (val <= 0.0) sliderx = 0;
else sliderx = int(val*(ww-S)+.5);
- if (Fl::event_button() == fltk3::middleMouseButton) area = 8;
+ if (Fl::event_button() == fltk3::MIDDLE_MOUSE) area = 8;
else if (relx < sliderx) area = 5;
else if (relx >= sliderx+S) area = 6;
else area = 8;
Modified: branches/branch-3.0/src/Fl_Text_Display.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Text_Display.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Text_Display.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -1941,19 +1941,19 @@
if (style & PRIMARY_MASK) {
if (Fl::focus() == (fltk3::Widget*)this) background = selection_color();
- else background = fltk3::colorAverage(color(), selection_color(), 0.4f);
+ else background = fltk3::color_average(color(), selection_color(), 0.4f);
} else if (style & HIGHLIGHT_MASK) {
- if (Fl::focus() == (fltk3::Widget*)this) background = fltk3::colorAverage(color(), selection_color(), 0.5f);
- else background = fltk3::colorAverage(color(), selection_color(), 0.6f);
+ if (Fl::focus() == (fltk3::Widget*)this) background = fltk3::color_average(color(), selection_color(), 0.5f);
+ else background = fltk3::color_average(color(), selection_color(), 0.6f);
} else background = color();
foreground = fltk3::contrast(styleRec->color, background);
} else if (style & PRIMARY_MASK) {
if (Fl::focus() == (fltk3::Widget*)this) background = selection_color();
- else background = fltk3::colorAverage(color(), selection_color(), 0.4f);
+ else background = fltk3::color_average(color(), selection_color(), 0.4f);
foreground = fltk3::contrast(textcolor(), background);
} else if (style & HIGHLIGHT_MASK) {
- if (Fl::focus() == (fltk3::Widget*)this) background = fltk3::colorAverage(color(), selection_color(), 0.5f);
- else background = fltk3::colorAverage(color(), selection_color(), 0.6f);
+ if (Fl::focus() == (fltk3::Widget*)this) background = fltk3::color_average(color(), selection_color(), 0.5f);
+ else background = fltk3::color_average(color(), selection_color(), 0.6f);
foreground = fltk3::contrast(textcolor(), background);
} else {
foreground = textcolor();
@@ -2016,13 +2016,13 @@
if (Fl::focus()==(fltk3::Widget*)this) {
fl_color(selection_color());
} else {
- fl_color(fltk3::colorAverage(color(), selection_color(), 0.4f));
+ fl_color(fltk3::color_average(color(), selection_color(), 0.4f));
}
} else if (style & HIGHLIGHT_MASK) {
if (Fl::focus()==(fltk3::Widget*)this) {
- fl_color(fltk3::colorAverage(color(), selection_color(), 0.5f));
+ fl_color(fltk3::color_average(color(), selection_color(), 0.5f));
} else {
- fl_color(fltk3::colorAverage(color(), selection_color(), 0.6f));
+ fl_color(fltk3::color_average(color(), selection_color(), 0.6f));
}
} else {
fl_color( color() );
@@ -3675,7 +3675,7 @@
buffer()->unselect(); // clicking in the selection: unselect and move cursor
insert_position(dragPos);
return 1;
- } else if (Fl::event_clicks() == DRAG_LINE && Fl::event_button() == fltk3::leftMouseButton) {
+ } else if (Fl::event_clicks() == DRAG_LINE && Fl::event_button() == fltk3::LEFT_MOUSE) {
buffer()->select(buffer()->line_start(dragPos), buffer()->next_char(buffer()->line_end(dragPos)));
dragPos = line_start(dragPos);
dragType = DRAG_CHAR;
Modified: branches/branch-3.0/src/Fl_Tree.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Tree.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Tree.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -637,7 +637,7 @@
set_item_focus(o); // becomes new focus widget
redraw();
ret |= 1; // handled
- if ( Fl::event_button() == fltk3::leftMouseButton ) {
+ if ( Fl::event_button() == fltk3::LEFT_MOUSE ) {
if ( o->event_on_collapse_icon(_prefs) ) { // collapse icon clicked?
open_toggle(o);
} else if ( o->event_on_label(_prefs) && // label clicked?
@@ -677,7 +677,7 @@
if ( p > (int)_vscroll->maximum() ) p = (int)_vscroll->maximum();
vposition(p);
}
- if ( Fl::event_button() != fltk3::leftMouseButton ) break;
+ if ( Fl::event_button() != fltk3::LEFT_MOUSE ) break;
Fl_Tree_Item *o = _root->find_clicked(_prefs);
if ( ! o ) break;
set_item_focus(o); // becomes new focus widget
Modified: branches/branch-3.0/src/Fl_Widget.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Widget.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Widget.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -117,7 +117,7 @@
label_.value = L;
label_.image = 0;
label_.deimage = 0;
- label_.type = fltk3::normalLabel;
+ label_.type = fltk3::NORMAL_LABEL;
label_.font = fltk3::HELVETICA;
label_.size = fltk3::NORMAL_SIZE;
label_.color = fltk3::FOREGROUND_COLOR;
Modified: branches/branch-3.0/src/Fl_Window.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Window.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_Window.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -46,11 +46,11 @@
type(FL_WINDOW);
box(fltk3::FLAT_BOX);
if (Fl::scheme_bg_) {
- labeltype(fltk3::normalLabel);
+ labeltype(fltk3::NORMAL_LABEL);
align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
image(Fl::scheme_bg_);
} else {
- labeltype(fltk3::noLabel);
+ labeltype(fltk3::NO_LABEL);
}
i = 0;
xclass_ = 0;
@@ -124,9 +124,9 @@
int x1 = w()-dx-1, x2 = x1, y1 = h()-dx-1, y2 = y1;
fltk3::Color c[4] = {
color(),
- fltk3::colorAverage(color(), fltk3::WHITE, 0.7f),
- fltk3::colorAverage(color(), fltk3::BLACK, 0.6f),
- fltk3::colorAverage(color(), fltk3::BLACK, 0.8f),
+ fltk3::color_average(color(), fltk3::WHITE, 0.7f),
+ fltk3::color_average(color(), fltk3::BLACK, 0.6f),
+ fltk3::color_average(color(), fltk3::BLACK, 0.8f),
};
int i;
for (i=dx; i<12; i++) {
Modified: branches/branch-3.0/src/Fl_cocoa.mm
===================================================================
--- branches/branch-3.0/src/Fl_cocoa.mm 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_cocoa.mm 2011-05-17 09:15:40 UTC (rev 8678)
@@ -2232,10 +2232,10 @@
void fltk3::Window::show() {
image(Fl::scheme_bg_);
if (Fl::scheme_bg_) {
- labeltype(fltk3::normalLabel);
+ labeltype(fltk3::NORMAL_LABEL);
align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
} else {
- labeltype(fltk3::noLabel);
+ labeltype(fltk3::NO_LABEL);
}
Fl_Tooltip::exit(this);
if (!shown() || !i) {
Modified: branches/branch-3.0/src/Fl_get_system_colors.cxx
===================================================================
--- branches/branch-3.0/src/Fl_get_system_colors.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_get_system_colors.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -65,7 +65,7 @@
double powb = log(b/255.0)/log((fltk3::GRAY-fltk3::GRAY_RAMP)/(fltk3::NUM_GRAY-1.0));
for (int i = 0; i < fltk3::NUM_GRAY; i++) {
double gray = i/(fltk3::NUM_GRAY-1.0);
- Fl::set_color(fltk3::grayRamp(i),
+ Fl::set_color(fltk3::gray_ramp(i),
uchar(pow(gray,powr)*255+.5),
uchar(pow(gray,powg)*255+.5),
uchar(pow(gray,powb)*255+.5));
@@ -411,7 +411,7 @@
// Set (or clear) the background tile for all windows...
for (win = first_window(); win; win = next_window(win)) {
- win->labeltype(scheme_bg_ ? fltk3::normalLabel : fltk3::noLabel);
+ win->labeltype(scheme_bg_ ? fltk3::NORMAL_LABEL : fltk3::NO_LABEL);
win->align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
win->image(scheme_bg_);
win->redraw();
Modified: branches/branch-3.0/src/Fl_mac.cxx
===================================================================
--- branches/branch-3.0/src/Fl_mac.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_mac.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -2374,10 +2374,10 @@
void fltk3::Window::show() {
image(Fl::scheme_bg_);
if (Fl::scheme_bg_) {
- labeltype(fltk3::normalLabel);
+ labeltype(fltk3::NORMAL_LABEL);
align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
} else {
- labeltype(fltk3::noLabel);
+ labeltype(fltk3::NO_LABEL);
}
Fl_Tooltip::exit(this);
if (!shown() || !i) {
Modified: branches/branch-3.0/src/Fl_win32.cxx
===================================================================
--- branches/branch-3.0/src/Fl_win32.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_win32.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -1775,10 +1775,10 @@
void fltk3::Window::show() {
image(Fl::scheme_bg_);
if (Fl::scheme_bg_) {
- labeltype(fltk3::normalLabel);
+ labeltype(fltk3::NORMAL_LABEL);
align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
} else {
- labeltype(fltk3::noLabel);
+ labeltype(fltk3::NO_LABEL);
}
Fl_Tooltip::exit(this);
if (!shown()) {
Modified: branches/branch-3.0/src/Fl_x.cxx
===================================================================
--- branches/branch-3.0/src/Fl_x.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/Fl_x.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -1861,10 +1861,10 @@
void fltk3::Window::show() {
image(Fl::scheme_bg_);
if (Fl::scheme_bg_) {
- labeltype(fltk3::normalLabel);
+ labeltype(fltk3::NORMAL_LABEL);
align(fltk3::ALIGN_CENTER | fltk3::ALIGN_INSIDE | fltk3::ALIGN_CLIP);
} else {
- labeltype(fltk3::noLabel);
+ labeltype(fltk3::NO_LABEL);
}
Fl_Tooltip::exit(this);
if (!shown()) {
Modified: branches/branch-3.0/src/fl_boxtype.cxx
===================================================================
--- branches/branch-3.0/src/fl_boxtype.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_boxtype.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -64,7 +64,7 @@
int Fl::draw_box_active() { return draw_it_active; }
namespace fltk3 {
- uchar *grayRamp() {return (draw_it_active?active_ramp:inactive_ramp)-'A';}
+ uchar *gray_ramp() {return (draw_it_active?active_ramp:inactive_ramp)-'A';}
}
/**
@@ -80,7 +80,7 @@
\param[in] x, y, w, h position and size
*/
void fltk3::frame(const char* s, int x, int y, int w, int h) {
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
if (h > 0 && w > 0) for (;*s;) {
// draw top line:
fl_color(g[(int)*s++]);
@@ -114,7 +114,7 @@
\param[in] x, y, w, h position and size
*/
void fl_frame2(const char* s, int x, int y, int w, int h) {
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
if (h > 0 && w > 0) for (;*s;) {
// draw bottom line:
fl_color(g[(int)*s++]);
Modified: branches/branch-3.0/src/fl_color.cxx
===================================================================
--- branches/branch-3.0/src/fl_color.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_color.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -136,7 +136,7 @@
}
void Fl_Xlib_Graphics_Driver::color(uchar r,uchar g,uchar b) {
- Fl_Graphics_Driver::color( fltk3::rgbColor(r, g, b) );
+ Fl_Graphics_Driver::color( fltk3::rgb_color(r, g, b) );
if(!fl_gc) return; // don't get a default gc if current window is not yet created/valid
XSetForeground(fl_display, fl_gc, fl_xpixel(r,g,b));
}
@@ -408,7 +408,7 @@
\param[in] color1, color2 boundary colors
\param[in] weight weighting factor
*/
-fltk3::Color fltk3::colorAverage(fltk3::Color color1, fltk3::Color color2, float weight) {
+fltk3::Color fltk3::color_average(fltk3::Color color1, fltk3::Color color2, float weight) {
unsigned rgb1;
unsigned rgb2;
uchar r, g, b;
@@ -423,14 +423,14 @@
g = (uchar)(((uchar)(rgb1>>16))*weight + ((uchar)(rgb2>>16))*(1-weight));
b = (uchar)(((uchar)(rgb1>>8))*weight + ((uchar)(rgb2>>8))*(1-weight));
- return fltk3::rgbColor(r, g, b);
+ return fltk3::rgb_color(r, g, b);
}
/**
Returns the inactive, dimmed version of the given color
*/
fltk3::Color fltk3::inactive(fltk3::Color c) {
- return fltk3::colorAverage(c, fltk3::GRAY, .33f);
+ return fltk3::color_average(c, fltk3::GRAY, .33f);
}
/**
Modified: branches/branch-3.0/src/fl_color_mac.cxx
===================================================================
--- branches/branch-3.0/src/fl_color_mac.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_color_mac.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -73,7 +73,7 @@
}
void Fl_Quartz_Graphics_Driver::color(uchar r, uchar g, uchar b) {
- Fl_Graphics_Driver::color( fltk3::rgbColor(r, g, b) );
+ Fl_Graphics_Driver::color( fltk3::rgb_color(r, g, b) );
float fr = r/255.0f;
float fg = g/255.0f;
float fb = b/255.0f;
Modified: branches/branch-3.0/src/fl_color_win32.cxx
===================================================================
--- branches/branch-3.0/src/fl_color_win32.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_color_win32.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -119,7 +119,7 @@
void Fl_GDI_Graphics_Driver::color(uchar r, uchar g, uchar b) {
static Fl_XMap xmap;
COLORREF c = RGB(r,g,b);
- Fl_Graphics_Driver::color( fltk3::rgbColor(r, g, b) );
+ Fl_Graphics_Driver::color( fltk3::rgb_color(r, g, b) );
if (!xmap.pen || c != xmap.rgb) {
clear_xmap(xmap);
set_xmap(xmap, c);
Modified: branches/branch-3.0/src/fl_diamond_box.cxx
===================================================================
--- branches/branch-3.0/src/fl_diamond_box.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_diamond_box.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -35,7 +35,7 @@
#include <fltk3/draw.h>
namespace fltk3 {
- extern uchar* grayRamp();
+ extern uchar* gray_ramp();
}
static void fl_diamond_up_box(int x,int y,int w,int h,fltk3::Color bgcolor) {
@@ -44,7 +44,7 @@
int x1 = x+w/2;
int y1 = y+h/2;
fl_color(bgcolor); fl_polygon(x+3, y1, x1,y+3, x+w-3,y1, x1,y+h-3);
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
fl_color(g['W']); fl_line(x+1, y1, x1, y+1, x+w-1, y1);
fl_color(g['U']); fl_line(x+2, y1, x1, y+2, x+w-2, y1);
fl_color(g['S']); fl_line(x+3, y1, x1, y+3, x+w-3, y1);
@@ -59,7 +59,7 @@
h &= -2;
int x1 = x+w/2;
int y1 = y+h/2;
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
fl_color(g['P']); fl_line(x+0, y1, x1, y+0, x+w-0, y1);
fl_color(g['N']); fl_line(x+1, y1, x1, y+1, x+w-1, y1);
fl_color(g['H']); fl_line(x+2, y1, x1, y+2, x+w-2, y1);
Modified: branches/branch-3.0/src/fl_gtk.cxx
===================================================================
--- branches/branch-3.0/src/fl_gtk.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_gtk.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -45,11 +45,11 @@
static void gtk_up_frame(int x, int y, int w, int h, fltk3::Color c) {
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.5));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.5));
fl_xyline(x + 2, y + 1, x + w - 3);
fl_yxline(x + 1, y + 2, y + h - 3);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.5));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.5));
fl_begin_loop();
fl_vertex(x, y + 2);
fl_vertex(x + 2, y);
@@ -66,26 +66,26 @@
static void gtk_up_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_up_frame(x, y, w, h, c);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.4f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.4f));
fl_xyline(x + 2, y + 2, x + w - 3);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.2f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.2f));
fl_xyline(x + 2, y + 3, x + w - 3);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.1f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.1f));
fl_xyline(x + 2, y + 4, x + w - 3);
gtk_color(c);
fl_rectf(x + 2, y + 5, w - 4, h - 7);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.025f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.025f));
fl_xyline(x + 2, y + h - 4, x + w - 3);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.05f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.05f));
fl_xyline(x + 2, y + h - 3, x + w - 3);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.1f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.1f));
fl_xyline(x + 2, y + h - 2, x + w - 3);
fl_yxline(x + w - 2, y + 2, y + h - 3);
}
static void gtk_down_frame(int x, int y, int w, int h, fltk3::Color c) {
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.5));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.5));
fl_begin_loop();
fl_vertex(x, y + 2);
fl_vertex(x + 2, y);
@@ -97,11 +97,11 @@
fl_vertex(x, y + h - 3);
fl_end_loop();
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.1f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.1f));
fl_xyline(x + 2, y + 1, x + w - 3);
fl_yxline(x + 1, y + 2, y + h - 3);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.05f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.05f));
fl_yxline(x + 2, y + h - 2, y + 2, x + w - 2);
}
@@ -116,11 +116,11 @@
static void gtk_thin_up_frame(int x, int y, int w, int h, fltk3::Color c) {
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.6f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.6f));
fl_xyline(x + 1, y, x + w - 2);
fl_yxline(x, y + 1, y + h - 2);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.4f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.4f));
fl_xyline(x + 1, y + h - 1, x + w - 2);
fl_yxline(x + w - 1, y + 1, y + h - 2);
}
@@ -129,29 +129,29 @@
static void gtk_thin_up_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_thin_up_frame(x, y, w, h, c);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.4f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.4f));
fl_xyline(x + 1, y + 1, x + w - 2);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.2f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.2f));
fl_xyline(x + 1, y + 2, x + w - 2);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.1f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.1f));
fl_xyline(x + 1, y + 3, x + w - 2);
gtk_color(c);
fl_rectf(x + 1, y + 4, w - 2, h - 8);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.025f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.025f));
fl_xyline(x + 1, y + h - 4, x + w - 2);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.05f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.05f));
fl_xyline(x + 1, y + h - 3, x + w - 2);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.1f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.1f));
fl_xyline(x + 1, y + h - 2, x + w - 2);
}
static void gtk_thin_down_frame(int x, int y, int w, int h, fltk3::Color c) {
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.4f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.4f));
fl_xyline(x + 1, y, x + w - 2);
fl_yxline(x, y + 1, y + h - 2);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.6f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.6f));
fl_xyline(x + 1, y + h - 1, x + w - 2);
fl_yxline(x + w - 1, y + 1, y + h - 2);
}
@@ -216,30 +216,30 @@
fl_color(c);
draw(FILL, x, y, w, h, 2);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.025f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.025f));
draw(LOWER_RIGHT, x+1, y, w-2, h, 2);
draw(LOWER_RIGHT, x, y, w, h, 3);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.05f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.05f));
draw(LOWER_RIGHT, x+1, y, w-2, h, 1);
draw(LOWER_RIGHT, x, y, w, h, 2);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.1f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.1f));
draw(LOWER_RIGHT, x+1, y, w-2, h, 0);
draw(LOWER_RIGHT, x, y, w, h, 1);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.1f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.1f));
draw(UPPER_LEFT, x, y, w, h, 4);
draw(UPPER_LEFT, x+1, y, w-2, h, 3);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.2f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.2f));
draw(UPPER_LEFT, x, y, w, h, 3);
draw(UPPER_LEFT, x+1, y, w-2, h, 2);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.4f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.4f));
draw(UPPER_LEFT, x, y, w, h, 2);
draw(UPPER_LEFT, x+1, y, w-2, h, 1);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.5f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.5f));
draw(UPPER_LEFT, x, y, w, h, 1);
draw(UPPER_LEFT, x+1, y, w-2, h, 0);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.5f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.5f));
draw(CLOSED, x, y, w, h, 0);
}
@@ -247,14 +247,14 @@
fl_color(c);
draw(FILL, x, y, w, h, 2);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.05f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.05f));
draw(UPPER_LEFT, x, y, w, h, 2);
draw(UPPER_LEFT, x+1, y, w-2, h, 1);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.1f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.1f));
draw(UPPER_LEFT, x, y, w, h, 1);
draw(UPPER_LEFT, x+1, y, w-2, h, 0);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.5f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.5f));
draw(CLOSED, x, y, w, h, 0);
}
@@ -263,11 +263,11 @@
static void gtk_round_up_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(c);
fl_pie(x, y, w, h, 0.0, 360.0);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.5f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.5f));
fl_arc(x, y, w, h, 45.0, 180.0);
- gtk_color(fltk3::colorAverage(fltk3::WHITE, c, 0.25f));
+ gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.25f));
fl_arc(x, y, w, h, 180.0, 405.0);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.5f));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.5f));
fl_arc(x, y, w, h, 225.0, 360.0);
}
@@ -275,9 +275,9 @@
static void gtk_round_down_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(c);
fl_pie(x, y, w, h, 0.0, 360.0);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.2));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.2));
fl_arc(x + 1, y, w, h, 90.0, 210.0);
- gtk_color(fltk3::colorAverage(fltk3::BLACK, c, 0.6));
+ gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.6));
fl_arc(x, y, w, h, 0.0, 360.0);
}
Modified: branches/branch-3.0/src/fl_labeltype.cxx
===================================================================
--- branches/branch-3.0/src/fl_labeltype.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_labeltype.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -66,7 +66,7 @@
fl_normal_label, // _FL_EMBOSSED_LABEL,
fl_no_label, // _FL_MULTI_LABEL,
fl_no_label, // _FL_ICON_LABEL,
- // fltk3::freeLabel+n:
+ // fltk3::FREE_LABELTYPE+n:
fl_no_label, fl_no_label, fl_no_label,
fl_no_label, fl_no_label, fl_no_label,
fl_no_label, fl_no_label, fl_no_label
Modified: branches/branch-3.0/src/fl_plastic.cxx
===================================================================
--- branches/branch-3.0/src/fl_plastic.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_plastic.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -45,13 +45,13 @@
#define USE_OLD_PLASTIC_COLOR
namespace fltk3 {
- extern uchar* grayRamp();
+ extern uchar* gray_ramp();
}
inline fltk3::Color shade_color(uchar gc, fltk3::Color bc) {
#ifdef USE_OLD_PLASTIC_COLOR
- return fltk3::colorAverage((fltk3::Color)gc, bc, 0.75f);
+ return fltk3::color_average((fltk3::Color)gc, bc, 0.75f);
#else
unsigned grgb = Fl::get_color((fltk3::Color)gc),
brgb = Fl::get_color(bc);
@@ -75,15 +75,15 @@
blue = 255;
if (Fl::draw_box_active())
- return fltk3::rgbColor(red, green, blue);
+ return fltk3::rgb_color(red, green, blue);
else
- return fltk3::colorAverage(fltk3::GRAY, fltk3::rgbColor(red, green, blue), 0.75f);
+ return fltk3::color_average(fltk3::GRAY, fltk3::rgb_color(red, green, blue), 0.75f);
#endif // USE_OLD_PLASTIC_COLOR
}
static void frame_rect(int x, int y, int w, int h, const char *c, fltk3::Color bc) {
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
int b = strlen(c) / 4 + 1;
for (x += b, y += b, w -= 2 * b, h -= 2 * b; b > 1; b --)
@@ -103,7 +103,7 @@
static void frame_round(int x, int y, int w, int h, const char *c, fltk3::Color bc) {
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
int b = strlen(c) / 4 + 1;
if (w==h) {
@@ -157,7 +157,7 @@
static void shade_rect(int x, int y, int w, int h, const char *c, fltk3::Color bc) {
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
int i, j;
int clen = strlen(c) - 1;
int chalf = clen / 2;
@@ -229,7 +229,7 @@
}
static void shade_round(int x, int y, int w, int h, const char *c, fltk3::Color bc) {
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
int i;
int clen = strlen(c) - 1;
int chalf = clen / 2;
@@ -289,7 +289,7 @@
static void narrow_thin_box(int x, int y, int w, int h, fltk3::Color c) {
if (h<=0 || w<=0) return;
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
fl_color(shade_color(g['R'], c));
fl_rectf(x+1, y+1, w-2, h-2);
fl_color(shade_color(g['I'], c));
Modified: branches/branch-3.0/src/fl_round_box.cxx
===================================================================
--- branches/branch-3.0/src/fl_round_box.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_round_box.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -33,7 +33,7 @@
#include <fltk3/draw.h>
namespace fltk3 {
- extern uchar* grayRamp();
+ extern uchar* gray_ramp();
}
@@ -88,7 +88,7 @@
}
void fl_round_down_box(int x, int y, int w, int h, fltk3::Color bgcolor) {
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
draw(FILL, x, y, w, h, 2, bgcolor);
draw(UPPER_LEFT, x+1, y, w-2, h, 0, (fltk3::Color)g['N']);
draw(UPPER_LEFT, x+1, y, w-2, h, 1, (fltk3::Color)g['H']);
@@ -102,7 +102,7 @@
}
void fl_round_up_box(int x, int y, int w, int h, fltk3::Color bgcolor) {
- uchar *g = fltk3::grayRamp();
+ uchar *g = fltk3::gray_ramp();
draw(FILL, x, y, w, h, 2, bgcolor);
draw(LOWER_RIGHT, x+1, y, w-2, h, 0, (fltk3::Color)g['H']);
draw(LOWER_RIGHT, x+1, y, w-2, h, 1, (fltk3::Color)g['N']);
Modified: branches/branch-3.0/src/fl_symbols.cxx
===================================================================
--- branches/branch-3.0/src/fl_symbols.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/fl_symbols.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -527,7 +527,7 @@
static void draw_filesaveas(fltk3::Color c) {
draw_filesave(c);
- fl_color(fltk3::colorAverage(c, fltk3::WHITE, 0.25f));
+ fl_color(fltk3::color_average(c, fltk3::WHITE, 0.25f));
BP;
vv(0.6, -0.8);
vv(1.0, -0.4);
@@ -563,7 +563,7 @@
vv(-1.0, 0.2);
EP;
- fl_color(fltk3::colorAverage(c, fltk3::WHITE, 0.25f));
+ fl_color(fltk3::color_average(c, fltk3::WHITE, 0.25f));
BP;
vv(-0.6, 0.0);
vv(-0.6, -1.0);
Modified: branches/branch-3.0/src/print_panel.cxx
===================================================================
--- branches/branch-3.0/src/print_panel.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/src/print_panel.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -120,8 +120,8 @@
}
static Fl_Menu_Item menu_print_page_size[] = {
- {"Letter", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
- {"A4", 0, 0, 0, 0, fltk3::normalLabel, 0, 14, 0},
+ {"Letter", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"A4", 0, 0, 0, 0, fltk3::NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0}
};
Modified: branches/branch-3.0/test/hello.cxx
===================================================================
--- branches/branch-3.0/test/hello.cxx 2011-05-17 01:41:48 UTC (rev 8677)
+++ branches/branch-3.0/test/hello.cxx 2011-05-17 09:15:40 UTC (rev 8678)
@@ -37,7 +37,7 @@
box->box(UP_BOX);
box->labelfont(BOLD+ITALIC);
box->labelsize(36);
- box->labeltype(shadowLabel);
+ box->labeltype(SHADOW_LABEL);
window->end();
window->show(argc, argv);
return Fl::run();
[ Direct Link to Message ] | |
