- Fix ANSI labels to put EOF1 and EOF2 after each file mark.

[bacula/bacula] / bacula / src / wx-console / wxbmainframe.h

diff --git a/bacula/src/wx-console/wxbmainframe.h b/bacula/src/wx-console/wxbmainframe.h
index a1abc3a770f4edc89f202648cde999d69e705b24..f3d8fbfb484af9c7e41f59eb7f33d7e2c469bdd3 100644 (file)
--- a/bacula/src/wx-console/wxbmainframe.h
+++ b/bacula/src/wx-console/wxbmainframe.h
@@ -2,8 +2,9 @@
  *
  *   Main frame header file
  *
- *    Nicolas Boichat, April 2004
+ *    Nicolas Boichat, July 2004
  *
+ *    Version $Id$
  */
 /*
    Copyright (C) 2004 Kern Sibbald and John Walker
@@ -48,6 +49,8 @@
 
 #include "wxbutils.h"
 
+#include "wxbhistorytextctrl.h"
+
 WX_DEFINE_ARRAY(wxbDataParser*, wxbDataParsers);
 
 // ----------------------------------------------------------------------------
@@ -59,13 +62,13 @@ class wxbPrintObject: public wxObject {
       wxString str;
       int status;
       wxbPrintObject(wxString str, int status): wxObject() {
-         this->str = str;
-         this->status = status;
+        this->str = str;
+        this->status = status;
       }
 
       wxbPrintObject(const wxbPrintObject& pe) {
-         this->str = pe.str;
-         this->status = pe.status;
+        this->str = pe.str;
+        this->status = pe.status;
       }
 };
 
@@ -104,7 +107,7 @@ public:
    /* Enable and disable panels */
    void EnablePanels();
    void DisablePanels(void* except = NULL);
-   
+
    void EnableConsole(bool enable = true);
 
    /*
@@ -121,10 +124,10 @@ public:
     *  If config is not empty, uses this config file.
     */
    void StartConsoleThread(const wxString& config);
-   
+
    /* Register a new wxbDataParser */
    void Register(wxbDataParser* dp);
-   
+
    /* Unregister a wxbDataParser */
    void Unregister(wxbDataParser* dp);
 
@@ -134,12 +137,15 @@ private:
    /* private constructor, singleton */
    wxbMainFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style);
    ~wxbMainFrame();
-   
+
+   static wxbMainFrame *frame; /* this */
+
    wxMenu *menuFile;
 
    wxNotebook *notebook; /* main notebook */
    wxTextCtrl *consoleCtrl; /* wxTextCtrl containing graphical console */
-   wxTextCtrl *typeCtrl; /* wxTextCtrl for console user input */
+   wxStaticText *helpCtrl; /* wxStaticText showing help messages */
+   wxbHistoryTextCtrl *typeCtrl; /* wxbHistoryTextCtrl for console user input */
    wxButton *sendButton; /* wxButton used to send data */
 
    wxbPanel **panels; /* panels array, contained in the notebook */
@@ -147,15 +153,14 @@ private:
 
    wxbPromptParser* promptparser; /* prompt parser catching uncatched questions */
 
-   static wxbMainFrame *frame; /* this */
-   
    bool lockedbyconsole; /* true if the panels have been locked by something typed in the console */
-   
-   wxString consoleBuffer;
-   
+
+   wxString configfile; /* configfile used */
+
+   wxString consoleBuffer; /* Buffer used to print in the console line by line */
+
    // any class wishing to process wxWindows events must use this macro
    DECLARE_EVENT_TABLE()
 };
 
 #endif // WXBMAINFRAME_H
-