Author: ianmacarthur
Date: 2011-07-29 02:57:36 -0700 (Fri, 29 Jul 2011)
New Revision: 8883
Log:
Had to add:
#include <stdint.h> /* For intptr_t. */
to workspace_panel.cxx to get it to compile on win32/mingw
Modified:
branches/branch-3.0/fluid/workspace_panel.cxx
branches/branch-3.0/fluid/workspace_panel.h
Modified: branches/branch-3.0/fluid/workspace_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/workspace_panel.cxx 2011-07-28 23:05:30 UTC
(rev 8882)
+++ branches/branch-3.0/fluid/workspace_panel.cxx 2011-07-29 09:57:36 UTC
(rev 8883)
@@ -27,6 +27,8 @@
#include "workspace_panel.h"
+#include <stdint.h> /* For intptr_t. */
+
void Fl_Environment_Choice::cb_pMenuAll_i(fltk3::Menu_*, void* v) {
// this is what we want to set or clear, pEnv is what we currently have
unsigned int e = (intptr_t)v;
@@ -58,7 +60,7 @@
if (mi->flags&fltk3::SUBMENU) level++;
mi++;
while (level && !mi->label()) {
- level--;
+ level--;
mi++;
}
}
@@ -139,12 +141,12 @@
ml->labelb = mi->text;
ml->typea = fltk3::IMAGE_LABEL;
ml->typeb = fltk3::NORMAL_LABEL;
- ml->label( mi );
+ ml->label( mi );
}
if (mi->flags&fltk3::SUBMENU) level++;
mi++;
while (level && !mi->label()) {
- level--;
+ level--;
mi++;
}
}
@@ -213,12 +215,12 @@
workspace_panel->end();
} // fltk3::DoubleWindow* workspace_panel
}
- if (wks_name)
+ if (wks_name)
pName->value(wks_name);
else
pName->value("unnamed workspace");
- if (wks_env)
- pEnv->value(wks_env);
+ if (wks_env)
+ pEnv->value(wks_env);
else
pEnv->value(Fl_Environment_Choice::ENV_ALL);
workspace_panel->show();
@@ -297,7 +299,7 @@
}
if (mod) set_modflag(1);
}
-
+
/*
void name_cb(fltk3::Input* o, void *v) {
if (v == LOAD) {
@@ -310,7 +312,7 @@
o->show();
snprintf(buf, sizeof(buf), "%s Properties", current_widget->title());
}
-
+
the_panel->label(buf);
} else {
if (numselected == 1) {
Property changes on: branches/branch-3.0/fluid/workspace_panel.cxx
___________________________________________________________________
Name: svn:keywords
+ author date id revision
Name: svn:eol-style
+ native
Property changes on: branches/branch-3.0/fluid/workspace_panel.h
___________________________________________________________________
Name: svn:keywords
+ author date id revision
Name: svn:eol-style
+ native
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
