Changeset 201:879e47e5b731 in glemon-0.x for new_map_win.h

Timestamp:

01/02/08 22:03:09 (16 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@3431

Message:

Merge branches/akos to trunk.

File:

• new_map_win.h (modified) (2 diffs)

new_map_win.h

@@ -36 +36 @@
   NoteBookTab & mytab;
 
+  MapType map_type;
+  Gtk::Label lblType;
+  Gtk::ComboBoxText cbType;
+
+  Gtk::Label lblErrorMsg;
+  void setErrorMsg(const Glib::ustring& msg);
+
+  std::vector<double>* evaluate_expr(const std::string polishform, bool itisedge);
+
 public:
 
@@ -60 +69 @@
   ///It creates the widgets shown in
   ///NewMapWin.
-  NewMapWin(const std::string& title, NoteBookTab &, bool itisedge=true, bool edgenode=true);
+  NewMapWin(const std::string& title, NoteBookTab &, bool itisedge=true, bool edgenode=true, MapType type = ALL);
 
   ///Callback function for OK button. It creates the map.