diff options
author | akir <akir> | 2004-10-21 10:46:21 (GMT) |
---|---|---|
committer | akir <akir> | 2004-10-21 10:46:21 (GMT) |
commit | 5136d4936eb22c2f9367e186305be91ad2630db0 (patch) | |
tree | 4fd1c12c248e27eedb263a05eb1a260f6c1521d9 | |
parent | 8086dd43dd2d56d765ecce2cddd7d984818ae055 (diff) | |
download | fluxbox_pavel-5136d4936eb22c2f9367e186305be91ad2630db0.zip fluxbox_pavel-5136d4936eb22c2f9367e186305be91ad2630db0.tar.bz2 |
removed unneeded code + some minor fix for mipspro
-rw-r--r-- | src/CommandDialog.cc | 22 | ||||
-rw-r--r-- | src/CommandDialog.hh | 5 |
2 files changed, 6 insertions, 21 deletions
diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc index d505e72..7dee468 100644 --- a/src/CommandDialog.cc +++ b/src/CommandDialog.cc | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: CommandDialog.cc,v 1.5 2004/10/06 19:02:03 akir Exp $ | 23 | // $Id: CommandDialog.cc,v 1.6 2004/10/21 10:46:21 akir Exp $ |
24 | 24 | ||
25 | #include "CommandDialog.hh" | 25 | #include "CommandDialog.hh" |
26 | 26 | ||
@@ -43,23 +43,9 @@ | |||
43 | #include <stdexcept> | 43 | #include <stdexcept> |
44 | using namespace std; | 44 | using namespace std; |
45 | 45 | ||
46 | CommandDialog::CommandDialog(BScreen &screen, const std::string &title): | 46 | CommandDialog::CommandDialog(BScreen &screen, |
47 | FbWindow(screen.rootWindow().screenNumber(), | 47 | const std::string &title, const std::string precommand) : |
48 | 0, 0, 200, 1, ExposureMask), | 48 | FbTk::FbWindow(screen.rootWindow().screenNumber(), 0, 0, 200, 1, ExposureMask), |
49 | m_textbox(*this, screen.winFrameTheme().font(), ""), | ||
50 | m_label(*this, screen.winFrameTheme().font(), title), | ||
51 | m_gc(m_textbox), | ||
52 | m_screen(screen), | ||
53 | m_move_x(0), | ||
54 | m_move_y(0), | ||
55 | m_pixmap(0) { | ||
56 | init(); | ||
57 | |||
58 | } | ||
59 | |||
60 | CommandDialog::CommandDialog(BScreen &screen, const std::string &title, const std::string &precommand): | ||
61 | FbWindow(screen.rootWindow().screenNumber(), | ||
62 | 0, 0, 200, 1, ExposureMask), | ||
63 | m_textbox(*this, screen.winFrameTheme().font(), ""), | 49 | m_textbox(*this, screen.winFrameTheme().font(), ""), |
64 | m_label(*this, screen.winFrameTheme().font(), title), | 50 | m_label(*this, screen.winFrameTheme().font(), title), |
65 | m_gc(m_textbox), | 51 | m_gc(m_textbox), |
diff --git a/src/CommandDialog.hh b/src/CommandDialog.hh index 9440866..2d3e9f2 100644 --- a/src/CommandDialog.hh +++ b/src/CommandDialog.hh | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: CommandDialog.hh,v 1.4 2004/10/06 19:02:03 akir Exp $ | 23 | // $Id: CommandDialog.hh,v 1.5 2004/10/21 10:46:21 akir Exp $ |
24 | 24 | ||
25 | #ifndef RUNCOMMANDDIALOG_HH | 25 | #ifndef RUNCOMMANDDIALOG_HH |
26 | #define RUNCOMMANDDIALOG_HH | 26 | #define RUNCOMMANDDIALOG_HH |
@@ -36,9 +36,8 @@ class BScreen; | |||
36 | 36 | ||
37 | class CommandDialog: public FbTk::FbWindow, public FbTk::EventHandler { | 37 | class CommandDialog: public FbTk::FbWindow, public FbTk::EventHandler { |
38 | public: | 38 | public: |
39 | CommandDialog(BScreen &screen, const std::string &title); | ||
40 | CommandDialog(BScreen &screen, const std::string &title, | 39 | CommandDialog(BScreen &screen, const std::string &title, |
41 | const std::string &pre_command); | 40 | const std::string pre_command = ""); |
42 | virtual ~CommandDialog(); | 41 | virtual ~CommandDialog(); |
43 | 42 | ||
44 | void setText(const std::string &text); | 43 | void setText(const std::string &text); |