Some Win32 fixes

[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 9b6c06869937af12fc4aaeb0819f575b46d99adf..9cdcc000057e84fa2b6cbccf6106ec4ff494cdd3 100644 (file)
--- a/bacula/src/wx-console/wxbmainframe.h
+++ b/bacula/src/wx-console/wxbmainframe.h
@@ -2,7 +2,7 @@
  *
  *   Main frame header file
  *
- *    Nicolas Boichat, April 2004
+ *    Nicolas Boichat, July 2004
  *
  */
 /*
@@ -48,6 +48,8 @@
 
 #include "wxbutils.h"
 
+#include "wxbhistorytextctrl.h"
+
 WX_DEFINE_ARRAY(wxbDataParser*, wxbDataParsers);
 
 // ----------------------------------------------------------------------------
@@ -94,6 +96,10 @@ public:
    /* event handlers (these functions should _not_ be virtual) */
    void OnQuit(wxCommandEvent& event);
    void OnAbout(wxCommandEvent& event);
+   void OnChangeConfig(wxCommandEvent& event);
+   void OnEditConfig(wxCommandEvent& event);
+   void OnConnect(wxCommandEvent& event);
+   void OnDisconnect(wxCommandEvent& event);
    void OnEnter(wxCommandEvent& event);
    void OnPrint(wxbThreadEvent& event);
 
@@ -114,8 +120,9 @@ public:
 
    /*
     *  Starts the thread interacting with the director
+    *  If config is not empty, uses this config file.
     */
-   void StartConsoleThread();
+   void StartConsoleThread(const wxString& config);
    
    /* Register a new wxbDataParser */
    void Register(wxbDataParser* dp);
@@ -123,26 +130,33 @@ public:
    /* Unregister a wxbDataParser */
    void Unregister(wxbDataParser* dp);
 
+   console_thread* ct; /* thread interacting with the director */
+
 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 *typeCtrl; /* wxTextCtrl for console user input */
    wxTextCtrl *consoleCtrl; /* wxTextCtrl containing graphical console */
+   wxbHistoryTextCtrl *typeCtrl; /* wxbHistoryTextCtrl for console user input */
+   wxButton *sendButton; /* wxButton used to send data */
 
    wxbPanel **panels; /* panels array, contained in the notebook */
    wxbDataParsers parsers; /* Data parsers, which need to receive director informations */
 
-   console_thread* ct; /* thread interacting with the director */
-
    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 */
    
-   int nlines; /* number of lines in the console */
-
+   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()
 };