diff options
| author | Manolo Gouy <Manolo> | 2015-12-13 09:36:14 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-12-13 09:36:14 +0000 |
| commit | cf14f77a901a64f12c5a103b782954692d8f6643 (patch) | |
| tree | e4f8d9d1213233692c314cb02ee620ddf7cc7d41 /src/Fl_File_Chooser2.cxx | |
| parent | 6bdb661c2af402eeb512f8d520f44e24e98e6cfb (diff) | |
Allowing to use FLTK objects in static initializers (cont'd).
For fl_file_chooser() and Fl_File_Chooser objects.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10961 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_File_Chooser2.cxx')
| -rw-r--r-- | src/Fl_File_Chooser2.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index e186c140b..6527a77dd 100644 --- a/src/Fl_File_Chooser2.cxx +++ b/src/Fl_File_Chooser2.cxx @@ -379,7 +379,7 @@ // File chooser label strings and sort function... // -Fl_Preferences Fl_File_Chooser::prefs_(Fl_Preferences::USER, "fltk.org", "filechooser"); +Fl_Preferences* Fl_File_Chooser::prefs_ = NULL; const char *Fl_File_Chooser::add_favorites_label = "Add to Favorites"; const char *Fl_File_Chooser::all_files_label = "All Files (*)"; @@ -546,8 +546,8 @@ Fl_File_Chooser::favoritesButtonCB() sprintf(menuname, "favorite%02d", v); - prefs_.set(menuname, directory_); - prefs_.flush(); + prefs_->set(menuname, directory_); + prefs_->flush(); quote_pathname(menuname, directory_, sizeof(menuname)); favoritesButton->add(menuname); @@ -590,7 +590,7 @@ Fl_File_Chooser::favoritesCB(Fl_Widget *w) // Get favorite directory 0 to 99... sprintf(name, "favorite%02d", i); - prefs_.get(name, pathname, "", sizeof(pathname)); + prefs_->get(name, pathname, "", sizeof(pathname)); // Stop on the first empty favorite... if (!pathname[0]) break; @@ -669,7 +669,7 @@ Fl_File_Chooser::favoritesCB(Fl_Widget *w) // Set favorite directory 0 to 99... sprintf(name, "favorite%02d", i); - prefs_.set(name, favList->text(i + 1)); + prefs_->set(name, favList->text(i + 1)); } // Clear old entries as necessary... @@ -677,14 +677,14 @@ Fl_File_Chooser::favoritesCB(Fl_Widget *w) // Clear favorite directory 0 to 99... sprintf(name, "favorite%02d", i); - prefs_.get(name, pathname, "", sizeof(pathname)); + prefs_->get(name, pathname, "", sizeof(pathname)); - if (pathname[0]) prefs_.set(name, ""); + if (pathname[0]) prefs_->set(name, ""); else break; } update_favorites(); - prefs_.flush(); + prefs_->flush(); favWindow->hide(); } @@ -1097,8 +1097,8 @@ Fl_File_Chooser::newdir() void Fl_File_Chooser::preview(int e) { previewButton->value(e); - prefs_.set("preview", e); - prefs_.flush(); + prefs_->set("preview", e); + prefs_->flush(); Fl_Group *p = previewBox->parent(); if (e) { @@ -1283,7 +1283,7 @@ Fl_File_Chooser::update_favorites() for (i = 0; i < 100; i ++) { sprintf(menuname, "favorite%02d", i); - prefs_.get(menuname, pathname, "", sizeof(pathname)); + prefs_->get(menuname, pathname, "", sizeof(pathname)); if (!pathname[0]) break; quote_pathname(menuname, pathname, sizeof(menuname)); |