gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't make non-inline methods from FLUID inline (that is, remove the

Browse Source 
"inline" from non-inline methods...)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4285 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2005-04-15 18:00:33 +00:00
parent e4e36d8229
commit fc4db19395
7 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
FL/Fl_File_Chooser.H
View File

@ -71,57 +71,57 @@ public:
Fl_File_Chooser(const char *d, const char *p, int t, const char *title);
private:
Fl_Double_Window *window;
inline void cb_window_i(Fl_Double_Window*, void*);
void cb_window_i(Fl_Double_Window*, void*);
static void cb_window(Fl_Double_Window*, void*);
Fl_Choice *showChoice;
inline void cb_showChoice_i(Fl_Choice*, void*);
void cb_showChoice_i(Fl_Choice*, void*);
static void cb_showChoice(Fl_Choice*, void*);
Fl_Menu_Button *favoritesButton;
inline void cb_favoritesButton_i(Fl_Menu_Button*, void*);
void cb_favoritesButton_i(Fl_Menu_Button*, void*);
static void cb_favoritesButton(Fl_Menu_Button*, void*);
public:
Fl_Button *newButton;
private:
inline void cb_newButton_i(Fl_Button*, void*);
void cb_newButton_i(Fl_Button*, void*);
static void cb_newButton(Fl_Button*, void*);
inline void cb__i(Fl_Tile*, void*);
void cb__i(Fl_Tile*, void*);
static void cb_(Fl_Tile*, void*);
Fl_File_Browser *fileList;
inline void cb_fileList_i(Fl_File_Browser*, void*);
void cb_fileList_i(Fl_File_Browser*, void*);
static void cb_fileList(Fl_File_Browser*, void*);
Fl_Box *previewBox;
public:
Fl_Check_Button *previewButton;
private:
inline void cb_previewButton_i(Fl_Check_Button*, void*);
void cb_previewButton_i(Fl_Check_Button*, void*);
static void cb_previewButton(Fl_Check_Button*, void*);
Fl_File_Input *fileName;
inline void cb_fileName_i(Fl_File_Input*, void*);
void cb_fileName_i(Fl_File_Input*, void*);
static void cb_fileName(Fl_File_Input*, void*);
Fl_Return_Button *okButton;
inline void cb_okButton_i(Fl_Return_Button*, void*);
void cb_okButton_i(Fl_Return_Button*, void*);
static void cb_okButton(Fl_Return_Button*, void*);
Fl_Button *cancelButton;
inline void cb_cancelButton_i(Fl_Button*, void*);
void cb_cancelButton_i(Fl_Button*, void*);
static void cb_cancelButton(Fl_Button*, void*);
Fl_Double_Window *favWindow;
Fl_File_Browser *favList;
inline void cb_favList_i(Fl_File_Browser*, void*);
void cb_favList_i(Fl_File_Browser*, void*);
static void cb_favList(Fl_File_Browser*, void*);
Fl_Button *favUpButton;
inline void cb_favUpButton_i(Fl_Button*, void*);
void cb_favUpButton_i(Fl_Button*, void*);
static void cb_favUpButton(Fl_Button*, void*);
Fl_Button *favDeleteButton;
inline void cb_favDeleteButton_i(Fl_Button*, void*);
void cb_favDeleteButton_i(Fl_Button*, void*);
static void cb_favDeleteButton(Fl_Button*, void*);
Fl_Button *favDownButton;
inline void cb_favDownButton_i(Fl_Button*, void*);
void cb_favDownButton_i(Fl_Button*, void*);
static void cb_favDownButton(Fl_Button*, void*);
Fl_Button *favCancelButton;
inline void cb_favCancelButton_i(Fl_Button*, void*);
void cb_favCancelButton_i(Fl_Button*, void*);
static void cb_favCancelButton(Fl_Button*, void*);
Fl_Return_Button *favOkButton;
inline void cb_favOkButton_i(Fl_Return_Button*, void*);
void cb_favOkButton_i(Fl_Return_Button*, void*);
static void cb_favOkButton(Fl_Return_Button*, void*);
public:
~Fl_File_Chooser();

14
FL/Fl_Help_Dialog.H
View File

@ -47,24 +47,24 @@ public:
private:
Fl_Double_Window *window_;
Fl_Help_View *view_;
inline void cb_view__i(Fl_Help_View*, void*);
void cb_view__i(Fl_Help_View*, void*);
static void cb_view_(Fl_Help_View*, void*);
inline void cb_Close_i(Fl_Button*, void*);
void cb_Close_i(Fl_Button*, void*);
static void cb_Close(Fl_Button*, void*);
Fl_Button *back_;
inline void cb_back__i(Fl_Button*, void*);
void cb_back__i(Fl_Button*, void*);
static void cb_back_(Fl_Button*, void*);
Fl_Button *forward_;
inline void cb_forward__i(Fl_Button*, void*);
void cb_forward__i(Fl_Button*, void*);
static void cb_forward_(Fl_Button*, void*);
Fl_Button *smaller_;
inline void cb_smaller__i(Fl_Button*, void*);
void cb_smaller__i(Fl_Button*, void*);
static void cb_smaller_(Fl_Button*, void*);
Fl_Button *larger_;
inline void cb_larger__i(Fl_Button*, void*);
void cb_larger__i(Fl_Button*, void*);
static void cb_larger_(Fl_Button*, void*);
Fl_Input *find_;
inline void cb_find__i(Fl_Input*, void*);
void cb_find__i(Fl_Input*, void*);
static void cb_find_(Fl_Input*, void*);
public:
~Fl_Help_Dialog();

4
fluid/Fl_Menu_Type.cxx
View File

@ -187,7 +187,7 @@ void Fl_Menu_Item_Type::write_static() {
const char* cn = callback_name();
const char* k = class_name(1);
if (k) {
write_c("\ninline void %s::%s_i(Fl_Menu_*", k, cn);
write_c("\nvoid %s::%s_i(Fl_Menu_*", k, cn);
} else {
write_c("\nstatic void %s(Fl_Menu_*", cn);
}
@ -343,7 +343,7 @@ void Fl_Menu_Item_Type::write_code1() {
const char* cn = callback_name();
const char* ut = user_data_type() ? user_data_type() : "void*";
write_public(0);
write_h(" inline void %s_i(Fl_Menu_*, %s);\n", cn, ut);
write_h(" void %s_i(Fl_Menu_*, %s);\n", cn, ut);
write_h(" static void %s(Fl_Menu_*, %s);\n", cn, ut);
}
}

4
fluid/Fl_Widget_Type.cxx
View File

@ -1475,7 +1475,7 @@ void Fl_Widget_Type::write_static() {
}
const char* cn = callback_name();
if (k) {
write_c("\ninline void %s::%s_i(%s*", k, cn, t);
write_c("\nvoid %s::%s_i(%s*", k, cn, t);
} else {
write_c("\nstatic void %s(%s*", cn, t);
}
@ -1535,7 +1535,7 @@ void Fl_Widget_Type::write_code1() {
const char* cn = callback_name();
const char* ut = user_data_type() ? user_data_type() : "void*";
write_public(0);
write_h(" inline void %s_i(%s*, %s);\n", cn, t, ut);
write_h(" void %s_i(%s*, %s);\n", cn, t, ut);
write_h(" static void %s(%s*, %s);\n", cn, t, ut);
}
// figure out if local varaible will be used (prevent compiler warnings):

32
src/Fl_File_Chooser.cxx
View File

@ -29,7 +29,7 @@
#include "../FL/Fl_File_Chooser.H"
inline void Fl_File_Chooser::cb_window_i(Fl_Double_Window*, void*) {
void Fl_File_Chooser::cb_window_i(Fl_Double_Window*, void*) {
fileName->value("");
fileList->deselect();
Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
@ -39,21 +39,21 @@ void Fl_File_Chooser::cb_window(Fl_Double_Window* o, void* v) {
((Fl_File_Chooser*)(o->user_data()))->cb_window_i(o,v);
}
inline void Fl_File_Chooser::cb_showChoice_i(Fl_Choice*, void*) {
void Fl_File_Chooser::cb_showChoice_i(Fl_Choice*, void*) {
showChoiceCB();
}
void Fl_File_Chooser::cb_showChoice(Fl_Choice* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_showChoice_i(o,v);
}
inline void Fl_File_Chooser::cb_favoritesButton_i(Fl_Menu_Button*, void*) {
void Fl_File_Chooser::cb_favoritesButton_i(Fl_Menu_Button*, void*) {
favoritesButtonCB();
}
void Fl_File_Chooser::cb_favoritesButton(Fl_Menu_Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favoritesButton_i(o,v);
}
inline void Fl_File_Chooser::cb_newButton_i(Fl_Button*, void*) {
void Fl_File_Chooser::cb_newButton_i(Fl_Button*, void*) {
newdir();
}
void Fl_File_Chooser::cb_newButton(Fl_Button* o, void* v) {
@ -66,35 +66,35 @@ static unsigned char idata_new[] =
\200\1\200\377\377\0\0";
static Fl_Bitmap image_new(idata_new, 16, 16);
inline void Fl_File_Chooser::cb__i(Fl_Tile*, void*) {
void Fl_File_Chooser::cb__i(Fl_Tile*, void*) {
update_preview();
}
void Fl_File_Chooser::cb_(Fl_Tile* o, void* v) {
((Fl_File_Chooser*)(o->parent()->user_data()))->cb__i(o,v);
}
inline void Fl_File_Chooser::cb_fileList_i(Fl_File_Browser*, void*) {
void Fl_File_Chooser::cb_fileList_i(Fl_File_Browser*, void*) {
fileListCB();
}
void Fl_File_Chooser::cb_fileList(Fl_File_Browser* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_fileList_i(o,v);
}
inline void Fl_File_Chooser::cb_previewButton_i(Fl_Check_Button*, void*) {
void Fl_File_Chooser::cb_previewButton_i(Fl_Check_Button*, void*) {
preview(previewButton->value());
}
void Fl_File_Chooser::cb_previewButton(Fl_Check_Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_previewButton_i(o,v);
}
inline void Fl_File_Chooser::cb_fileName_i(Fl_File_Input*, void*) {
void Fl_File_Chooser::cb_fileName_i(Fl_File_Input*, void*) {
fileNameCB();
}
void Fl_File_Chooser::cb_fileName(Fl_File_Input* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_fileName_i(o,v);
}
inline void Fl_File_Chooser::cb_okButton_i(Fl_Return_Button*, void*) {
void Fl_File_Chooser::cb_okButton_i(Fl_Return_Button*, void*) {
// Do any callback that is registered...
if (callback_)
(*callback_)(this, data_);
@ -105,7 +105,7 @@ void Fl_File_Chooser::cb_okButton(Fl_Return_Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_okButton_i(o,v);
}
inline void Fl_File_Chooser::cb_cancelButton_i(Fl_Button*, void*) {
void Fl_File_Chooser::cb_cancelButton_i(Fl_Button*, void*) {
fileName->value("");
fileList->deselect();
Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this);
@ -115,42 +115,42 @@ void Fl_File_Chooser::cb_cancelButton(Fl_Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_cancelButton_i(o,v);
}
inline void Fl_File_Chooser::cb_favList_i(Fl_File_Browser*, void*) {
void Fl_File_Chooser::cb_favList_i(Fl_File_Browser*, void*) {
favoritesCB(favList);
}
void Fl_File_Chooser::cb_favList(Fl_File_Browser* o, void* v) {
((Fl_File_Chooser*)(o->parent()->user_data()))->cb_favList_i(o,v);
}
inline void Fl_File_Chooser::cb_favUpButton_i(Fl_Button*, void*) {
void Fl_File_Chooser::cb_favUpButton_i(Fl_Button*, void*) {
favoritesCB(favUpButton);
}
void Fl_File_Chooser::cb_favUpButton(Fl_Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favUpButton_i(o,v);
}
inline void Fl_File_Chooser::cb_favDeleteButton_i(Fl_Button*, void*) {
void Fl_File_Chooser::cb_favDeleteButton_i(Fl_Button*, void*) {
favoritesCB(favDeleteButton);
}
void Fl_File_Chooser::cb_favDeleteButton(Fl_Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favDeleteButton_i(o,v);
}
inline void Fl_File_Chooser::cb_favDownButton_i(Fl_Button*, void*) {
void Fl_File_Chooser::cb_favDownButton_i(Fl_Button*, void*) {
favoritesCB(favDownButton);
}
void Fl_File_Chooser::cb_favDownButton(Fl_Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favDownButton_i(o,v);
}
inline void Fl_File_Chooser::cb_favCancelButton_i(Fl_Button*, void*) {
void Fl_File_Chooser::cb_favCancelButton_i(Fl_Button*, void*) {
favWindow->hide();
}
void Fl_File_Chooser::cb_favCancelButton(Fl_Button* o, void* v) {
((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_favCancelButton_i(o,v);
}
inline void Fl_File_Chooser::cb_favOkButton_i(Fl_Return_Button*, void*) {
void Fl_File_Chooser::cb_favOkButton_i(Fl_Return_Button*, void*) {
favoritesCB(favOkButton);
}
void Fl_File_Chooser::cb_favOkButton(Fl_Return_Button* o, void* v) {

16
src/Fl_Help_Dialog.cxx
View File

@ -31,7 +31,7 @@
#include "flstring.h"
#include <FL/fl_ask.H>
inline void Fl_Help_Dialog::cb_view__i(Fl_Help_View*, void*) {
void Fl_Help_Dialog::cb_view__i(Fl_Help_View*, void*) {
if (view_->changed())
{
index_ ++;
@ -66,14 +66,14 @@ void Fl_Help_Dialog::cb_view_(Fl_Help_View* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_view__i(o,v);
}
inline void Fl_Help_Dialog::cb_Close_i(Fl_Button*, void*) {
void Fl_Help_Dialog::cb_Close_i(Fl_Button*, void*) {
window_->hide();
}
void Fl_Help_Dialog::cb_Close(Fl_Button* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_Close_i(o,v);
}
inline void Fl_Help_Dialog::cb_back__i(Fl_Button*, void*) {
void Fl_Help_Dialog::cb_back__i(Fl_Button*, void*) {
if (index_ > 0)
index_ --;
@ -93,7 +93,7 @@ void Fl_Help_Dialog::cb_back_(Fl_Button* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_back__i(o,v);
}
inline void Fl_Help_Dialog::cb_forward__i(Fl_Button*, void*) {
void Fl_Help_Dialog::cb_forward__i(Fl_Button*, void*) {
if (index_ < max_)
index_ ++;
@ -113,7 +113,7 @@ void Fl_Help_Dialog::cb_forward_(Fl_Button* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_forward__i(o,v);
}
inline void Fl_Help_Dialog::cb_smaller__i(Fl_Button*, void*) {
void Fl_Help_Dialog::cb_smaller__i(Fl_Button*, void*) {
if (view_->textsize() > 8)
view_->textsize(view_->textsize() - 2);
@ -125,7 +125,7 @@ void Fl_Help_Dialog::cb_smaller_(Fl_Button* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_smaller__i(o,v);
}
inline void Fl_Help_Dialog::cb_larger__i(Fl_Button*, void*) {
void Fl_Help_Dialog::cb_larger__i(Fl_Button*, void*) {
if (view_->textsize() < 18)
view_->textsize(view_->textsize() + 2);
@ -137,7 +137,7 @@ void Fl_Help_Dialog::cb_larger_(Fl_Button* o, void* v) {
((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_larger__i(o,v);
}
inline void Fl_Help_Dialog::cb_find__i(Fl_Input*, void*) {
void Fl_Help_Dialog::cb_find__i(Fl_Input*, void*) {
find_pos_ = view_->find(find_->value(), find_pos_);
}
void Fl_Help_Dialog::cb_find_(Fl_Input* o, void* v) {
@ -197,7 +197,7 @@ Fl_Help_Dialog::Fl_Help_Dialog() {
o->color(FL_BACKGROUND2_COLOR);
{ Fl_Input* o = find_ = new Fl_Input(35, 352, 268, 21, "@search");
o->tooltip("find text in document");
o->box(FL_FLAT_BOX);
o->box(FL_NO_BOX);
o->labelsize(13);
o->callback((Fl_Callback*)cb_find_);
o->when(FL_WHEN_ENTER_KEY_ALWAYS);

4
src/Fl_x.cxx
View File

@ -20,7 +20,9 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
// Please report all bugs and problems to "fltk-bugs@fltk.org".
// Please report all bugs and problems on the following page:
//
// http://www.fltk.org/str.php
//
#ifdef WIN32