M src/CommandDialog.cc → src/CommandDialog.cc

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 <memory>
 #include <stdexcept>
 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),

M src/CommandDialog.hh → src/CommandDialog.hh

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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);