From 5136d4936eb22c2f9367e186305be91ad2630db0 Mon Sep 17 00:00:00 2001 From: akir Date: Thu, 21 Oct 2004 10:46:21 +0000 Subject: removed unneeded code + some minor fix for mipspro --- src/CommandDialog.cc | 22 ++++------------------ 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: CommandDialog.cc,v 1.5 2004/10/06 19:02:03 akir Exp $ +// $Id: CommandDialog.cc,v 1.6 2004/10/21 10:46:21 akir Exp $ #include "CommandDialog.hh" @@ -43,23 +43,9 @@ #include using namespace std; -CommandDialog::CommandDialog(BScreen &screen, const std::string &title): - FbWindow(screen.rootWindow().screenNumber(), - 0, 0, 200, 1, ExposureMask), - m_textbox(*this, screen.winFrameTheme().font(), ""), - m_label(*this, screen.winFrameTheme().font(), title), - m_gc(m_textbox), - m_screen(screen), - m_move_x(0), - m_move_y(0), - m_pixmap(0) { - init(); - -} - -CommandDialog::CommandDialog(BScreen &screen, const std::string &title, const std::string &precommand): - FbWindow(screen.rootWindow().screenNumber(), - 0, 0, 200, 1, ExposureMask), +CommandDialog::CommandDialog(BScreen &screen, + const std::string &title, const std::string precommand) : + FbTk::FbWindow(screen.rootWindow().screenNumber(), 0, 0, 200, 1, ExposureMask), m_textbox(*this, screen.winFrameTheme().font(), ""), m_label(*this, screen.winFrameTheme().font(), title), 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: CommandDialog.hh,v 1.4 2004/10/06 19:02:03 akir Exp $ +// $Id: CommandDialog.hh,v 1.5 2004/10/21 10:46:21 akir Exp $ #ifndef RUNCOMMANDDIALOG_HH #define RUNCOMMANDDIALOG_HH @@ -36,9 +36,8 @@ class BScreen; class CommandDialog: public FbTk::FbWindow, public FbTk::EventHandler { public: - CommandDialog(BScreen &screen, const std::string &title); CommandDialog(BScreen &screen, const std::string &title, - const std::string &pre_command); + const std::string pre_command = ""); virtual ~CommandDialog(); void setText(const std::string &text); -- cgit v0.11.2