mnuSleepMode in frmActivityMgr caused an assertion using wxNullBitmap which it should...

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index f07322d..d8faa7e 100644 (file)
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -29,11 +29,11 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        mnuManage->AppendSeparator();\r
        \r
        wxMenuItem* mnuImport;\r
-       mnuImport = new wxMenuItem( mnuManage, ID_MANAGE_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL );\r
+       mnuImport = new wxMenuItem( mnuManage, ID_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL );\r
        mnuManage->Append( mnuImport );\r
        \r
        wxMenuItem* mnuExport;\r
-       mnuExport = new wxMenuItem( mnuManage, ID_MANAGE_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL );\r
+       mnuExport = new wxMenuItem( mnuManage, ID_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL );\r
        mnuManage->Append( mnuExport );\r
        \r
        mnuPrefSep = mnuManage->AppendSeparator();\r
@@ -261,8 +261,8 @@ frmMainADT::~frmMainADT()
        // Disconnect Events\r
        this->Disconnect( ID_MANAGE_NEWAB, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenNewABDialog ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::RefreshAddressBook ) );\r
-       this->Disconnect( ID_MANAGE_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );\r
-       this->Disconnect( ID_MANAGE_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) );\r
+       this->Disconnect( ID_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );\r
+       this->Disconnect( ID_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) );\r
        this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenPreferences ) );\r
        this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) );\r
@@ -805,8 +805,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
        szrNewAccount = new wxBoxSizer( wxVERTICAL );\r
        \r
        tabType = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
-       tabType->Hide();\r
-       \r
        wxFlexGridSizer* fgSizer32;\r
        fgSizer32 = new wxFlexGridSizer( 0, 1, 0, 0 );\r
        fgSizer32->AddGrowableCol( 0 );\r
@@ -890,6 +888,8 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
        szrNewAccount->Add( tabType, 1, wxEXPAND | wxALL, 5 );\r
        \r
        tabConn = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       tabConn->Hide();\r
+       \r
        wxBoxSizer* bSizer323;\r
        bSizer323 = new wxBoxSizer( wxVERTICAL );\r
        \r
@@ -4079,11 +4079,6 @@ frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxS
        \r
        wxMenuItem* mnuSleepMode;\r
        mnuSleepMode = new wxMenuItem( mnuWindow, wxID_ANY, wxString( wxT("Sleep Mode") ) , wxEmptyString, wxITEM_CHECK );\r
-       #ifdef __WXMSW__\r
-       mnuSleepMode->SetBitmaps( wxNullBitmap );\r
-       #elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))\r
-       mnuSleepMode->SetBitmap( wxNullBitmap );\r
-       #endif\r
        mnuWindow->Append( mnuSleepMode );\r
        \r
        mnuWindow->AppendSeparator();\r

diff --git a/source/AppXestiaAddrBk.h b/source/AppXestiaAddrBk.h
index 9290350..3126cde 100644 (file)
--- a/source/AppXestiaAddrBk.h
+++ b/source/AppXestiaAddrBk.h
@@ -50,8 +50,8 @@
 ///////////////////////////////////////////////////////////////////////////\r
 \r
 #define ID_MANAGE_NEWAB 1000\r
-#define ID_MANAGE_IMPORT 1001\r
-#define ID_MANAGE_EXPORT 1002\r
+#define ID_IMPORT 1001\r
+#define ID_EXPORT 1002\r
 #define ID_CONTACT_EDIT 1003\r
 #define ID_CONTACT_DELETE 1004\r
 #define ID_VIEW_FNLN 1005\r