Author: matt
Date: 2011-08-02 11:09:07 -0700 (Tue, 02 Aug 2011)
New Revision: 8906
Log:
Double naming fixes.
Modified:
branches/branch-3.0/fluid/workspace_panel.cxx
branches/branch-3.0/fluid/workspace_panel.fl
Modified: branches/branch-3.0/fluid/workspace_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/workspace_panel.cxx 2011-08-02 18:04:56 UTC
(rev 8905)
+++ branches/branch-3.0/fluid/workspace_panel.cxx 2011-08-02 18:09:07 UTC
(rev 8906)
@@ -226,7 +226,7 @@
workspace_panel->show();
return workspace_panel;
}
-extern Fl_Panel *the_file_panel;
+extern fltk3::Window *the_file_panel;
void file_panel_set_cb(fltk3::Widget*, void *v) {
if (v == Fl_Panel::LOAD) {
Modified: branches/branch-3.0/fluid/workspace_panel.fl
===================================================================
--- branches/branch-3.0/fluid/workspace_panel.fl 2011-08-02 18:04:56 UTC
(rev 8905)
+++ branches/branch-3.0/fluid/workspace_panel.fl 2011-08-02 18:09:07 UTC
(rev 8906)
@@ -64,7 +64,7 @@
} {
MenuItem pMenuAll {
label {All Environments}
- user_data ENV_ALL
+ user_data FL_ENV_ALL
callback {// this is what we want to set or clear, pEnv is what we
currently have
unsigned int e = (intptr_t)v;
// find a good logic for settting, clearing, and partial values
@@ -88,19 +88,19 @@
} {
MenuItem {} {
label All
- user_data ENV_ALL_SHELL
+ user_data FL_ENV_ALL_SHELL
callback cb_pMenuAll
xywh {10 10 100 20} labelsize 12 divider
}
MenuItem {} {
label {Makefile (make, gmake)}
- user_data ENV_MAKE
+ user_data FL_ENV_MAKE
callback cb_pMenuAll
xywh {0 0 100 20} labelsize 12
}
MenuItem {} {
label {CMake File (cmake)}
- user_data ENV_CMAKE
+ user_data FL_ENV_CMAKE
callback cb_pMenuAll
xywh {0 0 100 20} labelsize 12
}
@@ -111,25 +111,25 @@
} {
MenuItem {} {
label All
- user_data ENV_ALL_VC
+ user_data FL_ENV_ALL_VC
callback cb_pMenuAll
xywh {0 0 100 20} labelsize 12 divider
}
MenuItem {} {
label {VisualC 6}
- user_data ENV_VC6
+ user_data FL_ENV_VC6
callback cb_pMenuAll
xywh {0 0 100 20} labelsize 12
}
MenuItem {} {
label {VisualC 2008}
- user_data ENV_VC2008
+ user_data FL_ENV_VC2008
callback cb_pMenuAll
xywh {0 0 100 20} labelsize 12
}
MenuItem {} {
label {VisualC 2010}
- user_data ENV_VC2010
+ user_data FL_ENV_VC2010
callback cb_pMenuAll
xywh {0 0 100 20} labelsize 12
}
@@ -140,19 +140,19 @@
} {
MenuItem {} {
label All
- user_data ENV_ALL_XC
+ user_data FL_ENV_ALL_XC
callback cb_pMenuAll
xywh {0 0 100 20} labelsize 12 divider
}
MenuItem {} {
label {Xcode 3}
- user_data ENV_XC3
+ user_data FL_ENV_XC3
callback cb_pMenuAll
xywh {0 0 100 20} labelsize 12
}
MenuItem {} {
label {Xcode 4}
- user_data ENV_XC4
+ user_data FL_ENV_XC4
callback cb_pMenuAll
xywh {0 0 100 20} labelsize 12
}
@@ -205,19 +205,19 @@
}
// update the text
-if (pEnv==ENV_ALL) {
+if (pEnv==FL_ENV_ALL) {
pEnvMenu->label("- all -");
-} else if (pEnv==ENV_NONE) {
+} else if (pEnv==FL_ENV_NONE) {
pEnvMenu->label("- none -");
} else {
char buf[1024]; buf[0] = 0;
- if (pEnv&ENV_MAKE) strcat(buf, "make, ");
- if (pEnv&ENV_CMAKE) strcat(buf, "cmake, ");
- if (pEnv&ENV_VC6) strcat(buf, "VC6, ");
- if (pEnv&ENV_VC2008) strcat(buf, "VC2008, ");
- if (pEnv&ENV_VC2010) strcat(buf, "VC2010, ");
- if (pEnv&ENV_XC3) strcat(buf, "Xcode3, ");
- if (pEnv&ENV_XC4) strcat(buf, "Xcode4, ");
+ if (pEnv&FL_ENV_MAKE) strcat(buf, "make, ");
+ if (pEnv&FL_ENV_CMAKE) strcat(buf, "cmake, ");
+ if (pEnv&FL_ENV_VC6) strcat(buf, "VC6, ");
+ if (pEnv&FL_ENV_VC2008) strcat(buf, "VC2008, ");
+ if (pEnv&FL_ENV_VC2010) strcat(buf, "VC2010, ");
+ if (pEnv&FL_ENV_XC3) strcat(buf, "Xcode3, ");
+ if (pEnv&FL_ENV_XC4) strcat(buf, "Xcode4, ");
int n = strlen(buf);
if (n>2) buf[n-2] = 0;
pEnvMenu->copy_label(buf);
@@ -273,7 +273,7 @@
if (wks_env)
pEnv->value(wks_env);
else
- pEnv->value(ENV_ALL);
+ pEnv->value(FL_ENV_ALL);
workspace_panel->show();} {}
}
@@ -315,11 +315,11 @@
if (Fl_Panel::numselected != 1) {
o->static_value("<Multiple Values>");
o->deactivate();
- snprintf(buf, sizeof(buf), "File Properties (%d files)",
Fl_Panel::numselected);
+ sprintf(buf, "File Properties (%d files)", Fl_Panel::numselected);
} else {
o->static_value(Fl_Panel::current_file()->filename());
o->activate();
- snprintf(buf, sizeof(buf), "%s Properties",
Fl_Panel::current_file()->name());
+ sprintf(buf, "%s Properties", Fl_Panel::current_file()->name());
}
the_file_panel->label(buf);
} else {
@@ -387,10 +387,10 @@
for (Fl_Type *t = Fl_Type::first; t; t = t->next) {
if (t->selected && t->is_file()) {
if (((Fl_File_Type*)t)->filetype() != e) {
- if (e==FILE_EXPLICIT)
+ if (e==FL_FILE_EXPLICIT)
((Fl_File_Type*)t)->set_default_type();
else
- ((Fl_File_Type*)t)->filetype(e|FILE_EXPLICIT);
+ ((Fl_File_Type*)t)->filetype(e|FL_FILE_EXPLICIT);
mod = 1;
}
}
@@ -399,7 +399,7 @@
}
char buf[64];
unsigned int ft = Fl_Panel::current_file()->filetype();
- if (ft&FILE_EXPLICIT) {
+ if (ft&FL_FILE_EXPLICIT) {
strcpy(buf, "explicit - ");
} else {
strcpy(buf, "default - ");
@@ -420,52 +420,52 @@
} {
MenuItem {} {
label Default
- user_data FILE_EXPLICIT user_data_type long
+ user_data FL_FILE_EXPLICIT user_data_type long
xywh {10 10 31 20} labelsize 12 divider
}
MenuItem {} {
label {C Source Code}
- user_data FILE_C_SOURCE user_data_type long
+ user_data FL_FILE_C_SOURCE user_data_type long
xywh {0 0 31 20} labelsize 12
}
MenuItem {} {
label {C Header}
- user_data FILE_C_HEADER user_data_type long
+ user_data FL_FILE_C_HEADER user_data_type long
xywh {10 10 31 20} labelsize 12
}
MenuItem {} {
label {C++ Source Code}
- user_data FILE_CPP_SOURCE user_data_type long
+ user_data FL_FILE_CPP_SOURCE user_data_type long
xywh {20 20 31 20} labelsize 12
}
MenuItem {} {
label {C++ Header}
- user_data FILE_CPP_HEADER user_data_type long
+ user_data FL_FILE_CPP_HEADER user_data_type long
xywh {30 30 31 20} labelsize 12
}
MenuItem {} {
label {ObjectiveC Source}
- user_data FILE_OBJC_SOURCE user_data_type long
+ user_data FL_FILE_OBJC_SOURCE user_data_type long
xywh {40 40 31 20} labelsize 12
}
MenuItem {} {
label {ObjectiveC Header}
- user_data FILE_OBJC_HEADER user_data_type long
+ user_data FL_FILE_OBJC_HEADER user_data_type long
xywh {50 50 31 20} labelsize 12
}
MenuItem {} {
label Text
- user_data FILE_TEXT user_data_type long
+ user_data FL_FILE_TEXT user_data_type long
xywh {60 60 31 20} labelsize 12
}
MenuItem {} {
label {Shell Script}
- user_data FILE_TEXT_SCRIPT user_data_type long
+ user_data FL_FILE_TEXT_SCRIPT user_data_type long
xywh {70 70 31 20} labelsize 12
}
MenuItem {} {
label Unknown
- user_data FILE_UNKNOWN user_data_type long
+ user_data FL_FILE_UNKNOWN user_data_type long
xywh {80 80 31 20} labelsize 12
}
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
