diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_File_Browser.H | 4 | ||||
| -rw-r--r-- | FL/Fl_File_Icon.H | 4 | ||||
| -rw-r--r-- | FL/Fl_File_Input.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Help_View.H | 13 | ||||
| -rw-r--r-- | FL/Fl_Plugin.H | 6 | ||||
| -rw-r--r-- | FL/Fl_Progress.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Shared_Image.H | 6 | ||||
| -rw-r--r-- | FL/Fl_Spinner.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Text_Display.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Wizard.H | 4 | ||||
| -rw-r--r-- | FL/mac.H | 4 |
11 files changed, 28 insertions, 29 deletions
diff --git a/FL/Fl_File_Browser.H b/FL/Fl_File_Browser.H index a025e51f9..aa1be5a5a 100644 --- a/FL/Fl_File_Browser.H +++ b/FL/Fl_File_Browser.H @@ -45,8 +45,8 @@ // /** The Fl_File_Browser widget displays a list of filenames, optionally with file-specific icons. */ -class FL_EXPORT Fl_File_Browser : public Fl_Browser -{ +class FL_EXPORT Fl_File_Browser : public Fl_Browser { + int filetype_; const char *directory_; uchar iconsize_; diff --git a/FL/Fl_File_Icon.H b/FL/Fl_File_Icon.H index 0bdfc26a6..17ade0cda 100644 --- a/FL/Fl_File_Icon.H +++ b/FL/Fl_File_Icon.H @@ -53,8 +53,8 @@ The Fl_File_Icon class manages icon images that can be used as labels in other widgets and as icons in the FileBrowser widget. */ -class FL_EXPORT Fl_File_Icon //// Icon data -{ +class FL_EXPORT Fl_File_Icon { //// Icon data + static Fl_File_Icon *first_; // Pointer to first icon/filetype Fl_File_Icon *next_; // Pointer to next icon/filetype const char *pattern_; // Pattern string diff --git a/FL/Fl_File_Input.H b/FL/Fl_File_Input.H index 24ae315ca..0a367d6ea 100644 --- a/FL/Fl_File_Input.H +++ b/FL/Fl_File_Input.H @@ -51,8 +51,8 @@ One resulting side effect is that you should call clear_changed() early in your callback to avoid reentrant calls if you plan to show another window or dialog box in the callback. */ -class FL_EXPORT Fl_File_Input : public Fl_Input -{ +class FL_EXPORT Fl_File_Input : public Fl_Input { + Fl_Color errorcolor_; char ok_entry_; uchar down_box_; diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H index c3a4af7e9..cf61a9d44 100644 --- a/FL/Fl_Help_View.H +++ b/FL/Fl_Help_View.H @@ -57,8 +57,7 @@ typedef const char *(Fl_Help_Func)(Fl_Widget *, const char *); // Fl_Help_Block structure... // -struct Fl_Help_Block -{ +struct Fl_Help_Block { const char *start, // Start of text *end; // End of text uchar border; // Draw border? @@ -74,8 +73,7 @@ struct Fl_Help_Block // Fl_Help_Link structure... // /** Definition of a link for the html viewer. */ -struct Fl_Help_Link -{ +struct Fl_Help_Link { char filename[192], ///< Reference filename name[32]; ///< Link target (blank if none) int x, ///< X offset of link text @@ -138,8 +136,7 @@ protected: /** Fl_Help_Target structure */ -struct Fl_Help_Target -{ +struct Fl_Help_Target { char name[32]; ///< Target name int y; ///< Y offset of target }; @@ -209,8 +206,8 @@ struct Fl_Help_Target - yen Yuml yuml */ -class FL_EXPORT Fl_Help_View : public Fl_Group // Help viewer widget -{ +class FL_EXPORT Fl_Help_View : public Fl_Group { // Help viewer widget + enum { RIGHT = -1, CENTER, LEFT }; ///< Alignments char title_[1024]; ///< Title string diff --git a/FL/Fl_Plugin.H b/FL/Fl_Plugin.H index 231a802cc..0bff10c85 100644 --- a/FL/Fl_Plugin.H +++ b/FL/Fl_Plugin.H @@ -67,8 +67,7 @@ } \endcode */ -class FL_EXPORT Fl_Plugin -{ +class FL_EXPORT Fl_Plugin { Fl_Preferences::ID id; public: Fl_Plugin(const char *klass, const char *name); @@ -80,8 +79,7 @@ public: \brief Fl_Plugin_Manager manages link-time and run-time plugin binaries. \see Fl_Plugin */ -class FL_EXPORT Fl_Plugin_Manager : public Fl_Preferences -{ +class FL_EXPORT Fl_Plugin_Manager : public Fl_Preferences { public: Fl_Plugin_Manager(const char *klass); ~Fl_Plugin_Manager(); diff --git a/FL/Fl_Progress.H b/FL/Fl_Progress.H index 0aaba5870..d8c96e3db 100644 --- a/FL/Fl_Progress.H +++ b/FL/Fl_Progress.H @@ -44,8 +44,8 @@ /** Displays a progress bar for the user. */ -class FL_EXPORT Fl_Progress : public Fl_Widget -{ +class FL_EXPORT Fl_Progress : public Fl_Widget { + float value_, minimum_, maximum_; diff --git a/FL/Fl_Shared_Image.H b/FL/Fl_Shared_Image.H index dd134947d..9a6134dc9 100644 --- a/FL/Fl_Shared_Image.H +++ b/FL/Fl_Shared_Image.H @@ -47,7 +47,11 @@ typedef Fl_Image *(*Fl_Shared_Handler)(const char *name, uchar *header, function to support standard image formats such as BMP, GIF, JPEG, and PNG. */ class FL_EXPORT Fl_Shared_Image : public Fl_Image { - protected: + + friend class Fl_JPEG_Image; + friend class Fl_PNG_Image; + +protected: static Fl_Shared_Image **images_; // Shared images static int num_images_; // Number of shared images diff --git a/FL/Fl_Spinner.H b/FL/Fl_Spinner.H index b131ba67f..32de7e23f 100644 --- a/FL/Fl_Spinner.H +++ b/FL/Fl_Spinner.H @@ -48,8 +48,8 @@ widget and repeat buttons. The user can either type into the input area or use the buttons to change the value. */ -class FL_EXPORT Fl_Spinner : public Fl_Group -{ +class FL_EXPORT Fl_Spinner : public Fl_Group { + double value_; // Current value double minimum_; // Minimum value double maximum_; // Maximum value diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H index 8d7a8d367..86a12ec92 100644 --- a/FL/Fl_Text_Display.H +++ b/FL/Fl_Text_Display.H @@ -47,8 +47,8 @@ in the widget is managed by the Fl_Text_Buffer class. A single Text Buffer can be displayed by multiple Text Displays. */ -class FL_EXPORT Fl_Text_Display: public Fl_Group -{ +class FL_EXPORT Fl_Text_Display: public Fl_Group { + public: /** diff --git a/FL/Fl_Wizard.H b/FL/Fl_Wizard.H index 389b79a64..500f5775d 100644 --- a/FL/Fl_Wizard.H +++ b/FL/Fl_Wizard.H @@ -47,8 +47,8 @@ <P>As with Fl_Tabs, wizard panes are composed of child (usually Fl_Group) widgets. Navigation buttons must be added separately. */ -class FL_EXPORT Fl_Wizard : public Fl_Group -{ +class FL_EXPORT Fl_Wizard : public Fl_Group { + Fl_Widget *value_; void draw(); @@ -109,8 +109,8 @@ extern void *fl_default_cursor; // This object contains all mac-specific stuff about a window: // WARNING: this object is highly subject to change! -class Fl_X -{ +class Fl_X { + public: Window xid; // pointer to the Cocoa window object (FLWindow*) Fl_Offscreen other_xid; // pointer for offscreen bitmaps (overlay window) |