summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>1999-08-09 13:53:55 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>1999-08-09 13:53:55 +0000
commit81241af1cfc5695a130cd385c9f6b17a364934e2 (patch)
tree5525b927c76b7281f0764fa727a2da99bff42ea8
parent1e4abdc8d08b6baba5cb52556d8c52745912f0a9 (diff)
Don't need ::write_declare, just write_declare...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@642 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--fluid/Fl_Menu_Type.cxx10
-rw-r--r--fluid/Fl_Widget_Type.cxx12
2 files changed, 11 insertions, 11 deletions
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx
index df2ce84e0..fe71853ac 100644
--- a/fluid/Fl_Menu_Type.cxx
+++ b/fluid/Fl_Menu_Type.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Menu_Type.cxx,v 1.16.2.3 1999/08/05 08:01:36 bill Exp $"
+// "$Id: Fl_Menu_Type.cxx,v 1.16.2.4 1999/08/09 13:53:54 mike Exp $"
//
// Menu item code for the Fast Light Tool Kit (FLTK).
//
@@ -114,11 +114,11 @@ const char* Fl_Menu_Item_Type::menu_name(int& i) {
void Fl_Menu_Item_Type::write_static() {
if (callback() && is_name(callback()))
- ::write_declare("extern void %s(Fl_Menu_*, %s);", callback(),
- user_data_type() ? user_data_type() : "void*");
+ write_declare("extern void %s(Fl_Menu_*, %s);", callback(),
+ user_data_type() ? user_data_type() : "void*");
for (int n=0; n < NUM_EXTRA_CODE; n++) {
if (extra_code(n) && isdeclare(extra_code(n)))
- ::write_declare("%s", extra_code(n));
+ write_declare("%s", extra_code(n));
}
if (callback() && !is_name(callback())) {
// see if 'o' or 'v' used, to prevent unused argument warnings:
@@ -439,5 +439,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) {
}
//
-// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.3 1999/08/05 08:01:36 bill Exp $".
+// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.4 1999/08/09 13:53:54 mike Exp $".
//
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index 0f4dffef9..88bf48ecb 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Widget_Type.cxx,v 1.15.2.5 1999/08/05 08:01:36 bill Exp $"
+// "$Id: Fl_Widget_Type.cxx,v 1.15.2.6 1999/08/09 13:53:55 mike Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
@@ -1224,14 +1224,14 @@ int isdeclare(const char *c) {
void Fl_Widget_Type::write_static() {
const char* t = subclassname(this);
- if (!subclass()) ::write_declare("#include <FL/%s.H>", t);
+ if (!subclass()) write_declare("#include <FL/%s.H>", t);
for (int n=0; n < NUM_EXTRA_CODE; n++) {
if (extra_code(n) && isdeclare(extra_code(n)))
- ::write_declare("%s", extra_code(n));
+ write_declare("%s", extra_code(n));
}
if (callback() && is_name(callback()))
- ::write_declare("extern void %s(%s*, %s);", callback(), t,
- user_data_type() ? user_data_type() : "void*");
+ write_declare("extern void %s(%s*, %s);", callback(), t,
+ user_data_type() ? user_data_type() : "void*");
const char* c = array_name(this);
const char* k = class_name();
if (c && !k) {
@@ -1746,5 +1746,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
}
//
-// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.5 1999/08/05 08:01:36 bill Exp $".
+// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.6 1999/08/09 13:53:55 mike Exp $".
//