[Hugin-cvs] hugin/src/include/hugin MyExternalCmdExecDialog.h, 1.2, 1.3 config_defaults.h, 1.36, 1.37

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6618/src/include/hugin

Modified Files:
	MyExternalCmdExecDialog.h config_defaults.h 
Log Message:
used MyExternalCmdExecDialog on unix to show progress of command line utils.


Index: config_defaults.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/config_defaults.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- config_defaults.h	1 Jan 2007 10:03:58 -0000	1.36
+++ config_defaults.h	1 Jan 2007 17:24:45 -0000	1.37
@@ -71,6 +71,8 @@
 #define HUGIN_APSIFT_EXE_CUSTOM               false
 
 
+#define HUGIN_EXECDIALOG_ENABLED              1l
+
 // Program defaults
 #if defined WIN32
 

Index: MyExternalCmdExecDialog.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/MyExternalCmdExecDialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MyExternalCmdExecDialog.h	1 Jan 2007 13:01:40 -0000	1.2
+++ MyExternalCmdExecDialog.h	1 Jan 2007 17:24:45 -0000	1.3
@@ -41,11 +41,15 @@
                             wxWindowID id, 
                             const wxString& title = _("Command Line Progress"), 
                             const wxPoint& pos = wxDefaultPosition, 
+#ifdef __WXMAC__
                             const wxSize& size = wxDefaultSize, 
+#else
+                            const wxSize& size = wxSize(650,480),
+#endif
                             long style = wxRESIZE_BORDER|wxFRAME_FLOAT_ON_PARENT|wxMINIMIZE_BOX,
                             const wxString& name = wxT("externalCmDialogBox"));
     
-    int ShowModal(wxString &cmd);
+    int ShowModal(const wxString &cmd);
     void OnTimer(wxTimerEvent& WXUNUSED(event));
     void OnIdle(wxIdleEvent& event);
     //wxListBox *GetLogListBox() const { return m_lbox; }
@@ -57,7 +61,7 @@
     wxTimer m_timerIdleWakeUp;
     MyPipedProcess *process;
     long processID;
-    
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -67,7 +71,9 @@
 {
 public:
     MyPipedProcess(MyExternalCmdExecDialog *parent, const wxString& cmd)
-    : wxProcess(parent), m_cmd(cmd)
+    : wxProcess(parent), m_cmd(cmd), 
+    m_backspaceInputSwallowed(false), m_backspaceErrorSwallowed(false),
+    m_crInputSwallowed(false), m_crErrorSwallowed(false)
     {
         m_parent = parent;
         Redirect();
@@ -79,4 +85,9 @@
 protected:
     MyExternalCmdExecDialog *m_parent;
     wxString m_cmd;
+
+    bool m_backspaceInputSwallowed;
+    bool m_backspaceErrorSwallowed;
+    bool m_crInputSwallowed;
+    bool m_crErrorSwallowed;
 };