structs.h: Moved QRNotif to common/structs.h

[xestiaab/.git] / source / frmMain.h

diff --git a/source/frmMain.h b/source/frmMain.h
index 24f4032..dd4273b 100644 (file)
--- a/source/frmMain.h
+++ b/source/frmMain.h
@@ -47,6 +47,7 @@ Subclass of frmMainADT, which is generated by wxFormBuilder.
 #include "common/timers.h"
 #include "common/events.h"
 #include "common/etag.h"
+#include "common/structs.h"
 #include "bitmaps.h"
 #include "common/sslcertstructs.h"
 #include "widgets/XABContactMenu.h"
@@ -99,11 +100,6 @@ struct SWCloseNotif{
        void *SCHWinPtr;
 };
 
-struct QRNotif{
-       int *QResponse;
-       bool *PausePtr;
-};
-
 struct XABViewMode{
 
        int SortMode;
@@ -152,7 +148,6 @@ class frmMain : public frmMainADT
                std::map<int,wxMenuItem*> WindowListPointersMenu;
                std::map<int,void*> WindowListPointers;
                std::map<int,int> WindowListType;
-               //std::map<int,int> WindowListType;
                wxMenuItem *mnuContactWindows;
                wxMenuItem *mnuContactEditorWindows;
                wxMenuItem *mnuSearchWindows;
@@ -160,15 +155,11 @@ class frmMain : public frmMainADT
                bool RevealWait = FALSE;
                wxString SessionID;
                wxString OldSessionID;
+               wxColour ContactBackgroundColour;
                wxIcon IconEmp;
-               //wxIcon Emp;
-               //wxComboCtrl* AccControl = new wxGenericComboCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize);
-               //wxComboCtrl* AccControl = new wxComboCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCB_READONLY|wxEXPAND|wxCC_STD_BUTTON);
-               //wxStaticBitmap* AccIcon = new wxStaticBitmap(this, wxID_ANY, IconEmp, wxDefaultPosition, wxSize(16,16), wxALL|wxEXPAND, wxStaticBitmapNameStr);
                XABAccountView* treAccounts = new XABAccountView();
                wxImageList *AccImgList =  new wxImageList(16,16,true);
                wxImageList *ActMgrImgList = new wxImageList(16,16,true);
-               //wxIcon wxIAccInet;
                int AccountID;
                int AccountNetID;
                int AccountGrpID;
@@ -292,6 +283,7 @@ class frmMain : public frmMainADT
 #else
                void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollectionString SSLCertInc);
 #endif
+               bool CloseAllWindows();
                DECLARE_EVENT_TABLE()
 
        //// end generated class members