1.1 --- a/gui/map_win.h Fri Jan 06 13:58:49 2006 +0000
1.2 +++ b/gui/map_win.h Fri Jan 06 14:36:46 2006 +0000
1.3 @@ -7,6 +7,7 @@
1.4
1.5 #include <all_include.h>
1.6 #include <nbtab.h>
1.7 +#include <mapselector.h>
1.8 #include <libgnomecanvasmm.h>
1.9 #include <libgnomecanvasmm/polygon.h>
1.10
1.11 @@ -15,55 +16,6 @@
1.12 ///assigned to maps.
1.13 class MapWin : public Gtk::Window
1.14 {
1.15 -
1.16 - class MapSelector : public Gtk::HBox
1.17 - {
1.18 - protected:
1.19 - sigc::signal<void, std::string> signal_cbt;
1.20 - sigc::signal<void, bool> signal_newmapwin;
1.21 -
1.22 - int id;
1.23 -
1.24 - bool itisedge;
1.25 -
1.26 - bool default_state;
1.27 -
1.28 - bool set_new_map;
1.29 -
1.30 - Gtk::ComboBoxText cbt;
1.31 -
1.32 - Gtk::Button * newbut, * defbut;
1.33 -
1.34 - Gtk::HBox hbox;
1.35 -
1.36 - Gtk::Label * label;
1.37 -
1.38 - public:
1.39 -
1.40 - MapSelector(std::vector<std::string>, std::string, int, bool);
1.41 -
1.42 - sigc::signal<void, std::string> signal_cbt_ch();
1.43 - sigc::signal<void, bool> signal_newmapwin_needed();
1.44 -
1.45 - void update_list( std::vector<std::string> );
1.46 -
1.47 - ///If a radiobutton is clicked, this function determines
1.48 - ///which button was that and after that calls the
1.49 - ///appropriate function of the \ref GraphDisplayerCanvas
1.50 - ///to change the visible values of that attribute.
1.51 - virtual void comboChanged();
1.52 -
1.53 - virtual void new_but_pressed();
1.54 -
1.55 - virtual void reset();
1.56 -
1.57 - Glib::ustring get_active_text();
1.58 - void set_active_text(Glib::ustring);
1.59 - void append_text(Glib::ustring);
1.60 - };
1.61 -
1.62 -
1.63 -
1.64 protected:
1.65 NoteBookTab & mytab;
1.66