diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-06-19 10:00:24 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-06-19 10:00:24 +0000 |
| commit | 06dfaa02d7a80bcdff717d579a48f81643f53f31 (patch) | |
| tree | 49b8e67ad9051f1507b0959cac986383ab4001e2 /src/pedro | |
| parent | Fix rendering of control points (diff) | |
| parent | fix bug 796451: Measure tools should support rotation constraint (diff) | |
| download | inkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.tar.gz inkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.zip | |
Merge from trunk
(bzr r9508.1.89)
Diffstat (limited to 'src/pedro')
| -rw-r--r-- | src/pedro/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | src/pedro/pedrogui.h | 3 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/pedro/CMakeLists.txt b/src/pedro/CMakeLists.txt index cb9a01b2f..c51090067 100644 --- a/src/pedro/CMakeLists.txt +++ b/src/pedro/CMakeLists.txt @@ -1,13 +1,14 @@ -SET(pedro_SRC -#empty.cpp -#geckoembed.cpp -pedroconfig.cpp -pedrodom.cpp -#pedrogui.cpp -#pedromain.cpp -pedroutil.cpp -pedroxmpp.cpp + +set(pedro_SRC + #empty.cpp + #geckoembed.cpp + pedroconfig.cpp + pedrodom.cpp + #pedrogui.cpp + #pedromain.cpp + pedroutil.cpp + pedroxmpp.cpp ) -ADD_LIBRARY(pedro STATIC ${pedro_SRC}) -TARGET_LINK_LIBRARIES(pedro -${INKSCAPE_LIBS})
\ No newline at end of file + +# add_inkscape_lib(pedro_LIB "${pedro_SRC}") +add_inkscape_source("${pedro_SRC}") diff --git a/src/pedro/pedrogui.h b/src/pedro/pedrogui.h index 4af4f1aac..2898da118 100644 --- a/src/pedro/pedrogui.h +++ b/src/pedro/pedrogui.h @@ -26,6 +26,7 @@ #include <gtkmm.h> +#include "ui/widget/spinbutton.h" #include "pedroxmpp.h" #include "pedroconfig.h" @@ -590,7 +591,7 @@ private: Gtk::Label hostLabel; Gtk::Entry hostField; Gtk::Label portLabel; - Gtk::SpinButton portSpinner; + Inkscape::UI::Widget::SpinButton portSpinner; Gtk::Label userLabel; Gtk::Entry userField; Gtk::Label passLabel; |