diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2008-01-04 21:45:49 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2008-01-04 21:45:49 +0000 |
| commit | a1f96ffea02ffd023897fd23328d20f66c11212e (patch) | |
| tree | ff9ce9d29692bdd5e1c33bae645b494330391ab7 /fluid/function_panel.h | |
| parent | 329f5de33080274b8b2cf3bbb92c61e04b039fa5 (diff) | |
STR #1776: FLUID now tries to find a previously declared callback to avoid declaring one as 'extern'. I also replaced many 'public' Light_Buttons with pulldown menus which offer either 'local'/'global', or 'private'/'public'/'protected', depending if the item is outside or inside a class. I took great care to make this change transparent to previous .fl files. Downward compatibility is only problematic if the new 'protected' keyword is used.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6012 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/function_panel.h')
| -rw-r--r-- | fluid/function_panel.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/fluid/function_panel.h b/fluid/function_panel.h index 08740183d..d2886d04b 100644 --- a/fluid/function_panel.h +++ b/fluid/function_panel.h @@ -33,8 +33,10 @@ #include <FL/Fl_Double_Window.H> extern Fl_Double_Window *function_panel; #include <FL/Fl_Group.H> +#include <FL/Fl_Choice.H> +extern Fl_Choice *f_public_member_choice; +extern Fl_Choice *f_public_choice; #include <FL/Fl_Light_Button.H> -extern Fl_Light_Button *f_public_button; extern Fl_Light_Button *f_c_button; #include <FL/Fl_Box.H> #include <FL/Fl_Input.H> @@ -45,6 +47,8 @@ extern Fl_Return_Button *f_panel_ok; #include <FL/Fl_Button.H> extern Fl_Button *f_panel_cancel; Fl_Double_Window* make_function_panel(); +extern Fl_Menu_Item menu_f_public_member_choice[]; +extern Fl_Menu_Item menu_f_public_choice[]; extern Fl_Double_Window *code_panel; #include "CodeEditor.h" extern CodeEditor *code_input; @@ -58,19 +62,23 @@ extern Fl_Return_Button *codeblock_panel_ok; extern Fl_Button *codeblock_panel_cancel; Fl_Double_Window* make_codeblock_panel(); extern Fl_Double_Window *declblock_panel; +extern Fl_Choice *declblock_public_choice; +extern Fl_Light_Button *declblock_public_button_x; extern Fl_Input *decl_before_input; extern Fl_Input *decl_after_input; extern Fl_Return_Button *declblock_panel_ok; extern Fl_Button *declblock_panel_cancel; -extern Fl_Light_Button *declblock_public_button; Fl_Double_Window* make_declblock_panel(); +extern Fl_Menu_Item menu_declblock_public_choice[]; extern Fl_Double_Window *decl_panel; -extern Fl_Light_Button *decl_public_button; -extern Fl_Light_Button *decl_static_button; +extern Fl_Choice *decl_choice; +extern Fl_Choice *decl_class_choice; extern Fl_Input *decl_input; extern Fl_Return_Button *decl_panel_ok; extern Fl_Button *decl_panel_cancel; Fl_Double_Window* make_decl_panel(); +extern Fl_Menu_Item menu_decl_choice[]; +extern Fl_Menu_Item menu_decl_class_choice[]; extern Fl_Double_Window *class_panel; extern Fl_Light_Button *c_public_button; extern Fl_Input *c_name_input; @@ -91,7 +99,6 @@ Fl_Double_Window* make_comment_panel(); void type_make_cb(Fl_Widget*,void*d); #include <FL/Fl_Window.H> extern Fl_Window *widgetbin_panel; -extern void type_make_cb(Fl_Button*, void*); Fl_Window* make_widgetbin(); extern void toggle_sourceview_cb(Fl_Double_Window*, void*); extern Fl_Double_Window *sourceview_panel; |