tray icon + ask before closing

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@10 1a98c847-1fd6-4fd8-948a-caf3550aa51b

diff --git a/bugs.txt b/bugs.txt
new file mode 100644 (file)
index 0000000..348c359
--- /dev/null
+++ b/bugs.txt
@@ -0,0 +1,4 @@
+Known bugs:\r
+- For some reason, CreateHardLink doesn't add a shortcut to the startup folder\r
+- When the program is minimized to tray, double clicking the icon only restores it to the task bar\r
+- Window flickers when blocks are added (problem with repainting?)
\ No newline at end of file

diff --git a/changelog.txt b/changelog.txt
index 19120c3..685eb62 100644 (file)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,2 +1,6 @@
 Changes after 0.1.5:
 --------------------
++ Options dialog layout changed - added the UI options panel
++ Minimize to tray feature
++ Startup on system boot feature
++ Ask before closing
\ No newline at end of file

diff --git a/db.cpp b/db.cpp
index f38f3ff..6607ff5 100644 (file)
--- a/db.cpp
+++ b/db.cpp
@@ -575,6 +575,11 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
                 if (strKey == "fGenerateBitcoins")  ssValue >> fGenerateBitcoins;\r
                 if (strKey == "nTransactionFee")    ssValue >> nTransactionFee;\r
                 if (strKey == "addrIncoming")       ssValue >> addrIncoming;\r
+                if (strKey == "minimizeToTray")       ssValue >> minimizeToTray;\r
+                if (strKey == "closeToTray")       ssValue >> closeToTray;\r
+                if (strKey == "startOnSysBoot")       ssValue >> startOnSysBoot;\r
+                if (strKey == "askBeforeClosing")       ssValue >> askBeforeClosing;\r
+                if (strKey == "alwaysShowTrayIcon")       ssValue >> alwaysShowTrayIcon;\r
             }\r
         }\r
     }\r

diff --git a/headers.h b/headers.h
index 7bd68a1..9291150 100644 (file)
--- a/headers.h
+++ b/headers.h
@@ -10,11 +10,16 @@
 #ifdef _WIN32_WINNT\r
 #undef _WIN32_WINNT\r
 #endif\r
-#define _WIN32_WINNT 0x0400\r
+#define _WIN32_WINNT 0x0500\r
+#ifdef _WIN32_IE\r
+#undef _WIN32_IE\r
+#endif\r
+#define _WIN32_IE 0x0500\r
 #define WIN32_LEAN_AND_MEAN 1\r
 #include <wx/wx.h>\r
 #include <wx/clipbrd.h>\r
 #include <wx/snglinst.h>\r
+#include <wx/taskbar.h>\r
 #include <openssl/ecdsa.h>\r
 #include <openssl/evp.h>\r
 #include <openssl/rand.h>\r
@@ -32,6 +37,7 @@
 #include <assert.h>\r
 #include <process.h>\r
 #include <malloc.h>\r
+#include <shlobj.h>\r
 #include <memory>\r
 #define BOUNDSCHECK 1\r
 #include <sstream>\r

diff --git a/main.cpp b/main.cpp
index 97000db..ebf9d72 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -54,9 +54,6 @@ CAddress addrIncoming;
 \r
 \r
 \r
-\r
-\r
-\r
 //////////////////////////////////////////////////////////////////////////////\r
 //\r
 // mapKeys\r

diff --git a/main.h b/main.h
index 3432b31..9dd29bb 100644 (file)
--- a/main.h
+++ b/main.h
@@ -47,7 +47,6 @@ extern CAddress addrIncoming;
 \r
 \r
 \r
-\r
 string GetAppDir();\r
 bool CheckDiskSpace(int64 nAdditionalBytes=0);\r
 FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode="rb");\r

diff --git a/makefile b/makefile
index 534eb52..221684e 100644 (file)
--- a/makefile
+++ b/makefile
@@ -12,7 +12,7 @@ ifeq "$(BUILD)" "debug"
 D=d\r
 # note: gcc 3.x profile doesn't work\r
 #DEBUGFLAGS=-O0 -g -pg -D__WXDEBUG__\r
-DEBUGFLAGS=-g -D__WXDEBUG__\r
+DEBUGFLAGS=-g -D__WXDEBUG__ -Wall -Wextra\r
 endif\r
 \r
 \r
@@ -22,7 +22,7 @@ LIBPATHS=-L"/DB/build_unix" -L"/OpenSSL/out" -L"/wxWidgets/lib/gcc_lib"
 LIBS= \\r
  -l db_cxx \\r
  -l eay32 \\r
- -l wxmsw28$(D)_richtext -l wxmsw28$(D)_html -l wxmsw28$(D)_core -l wxbase28$(D) -l wxtiff$(D) -l wxjpeg$(D) -l wxpng$(D) -l wxzlib$(D) -l wxregex$(D) -l wxexpat$(D) \\r
+ -l wxmsw28$(D)_richtext -l wxmsw28$(D)_html -l wxmsw28$(D)_core -l wxmsw28$(D)_adv -l wxbase28$(D) -l wxtiff$(D) -l wxjpeg$(D) -l wxpng$(D) -l wxzlib$(D) -l wxregex$(D) -l wxexpat$(D) \\r
  -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32\r
 WXDEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH\r
 CFLAGS=-mthreads -O0 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)\r

diff --git a/ui.cpp b/ui.cpp
index 96c5a83..751a50b 100644 (file)
--- a/ui.cpp
+++ b/ui.cpp
@@ -7,8 +7,6 @@
 #include <crtdbg.h>\r
 #endif\r
 \r
-\r
-\r
 DEFINE_EVENT_TYPE(wxEVT_CROSSTHREADCALL)\r
 DEFINE_EVENT_TYPE(wxEVT_REPLY1)\r
 DEFINE_EVENT_TYPE(wxEVT_REPLY2)\r
@@ -19,6 +17,7 @@ DEFINE_EVENT_TYPE(wxEVT_TABLEDELETED)
 \r
 CMainFrame* pframeMain = NULL;\r
 map<string, string> mapAddressBook;\r
+CBitcoinTBIcon* taskBarIcon = NULL; // Tray icon\r
 \r
 \r
 void ThreadRequestProductDetails(void* parg);\r
@@ -27,8 +26,12 @@ bool fRandSendTest = false;
 void RandSend();\r
 extern int g_isPainting;\r
 \r
-\r
-\r
+// UI settings and their default values\r
+int minimizeToTray = 1;\r
+int closeToTray = 1;\r
+int startOnSysBoot = 1;\r
+int askBeforeClosing = 1;\r
+int alwaysShowTrayIcon = 1;\r
 \r
 \r
 \r
@@ -359,8 +362,28 @@ void Shutdown(void* parg)
 \r
 void CMainFrame::OnClose(wxCloseEvent& event)\r
 {\r
-    Destroy();\r
-    _beginthread(Shutdown, 0, NULL);\r
+       if (closeToTray && event.CanVeto()) {\r
+               event.Veto();\r
+               SendToTray();\r
+       }\r
+       else if (!event.CanVeto() || !askBeforeClosing || wxMessageBox("Quit program?", "Confirm", wxYES_NO, this) == wxYES) {\r
+               delete taskBarIcon;\r
+           Destroy();\r
+           _beginthread(Shutdown, 0, NULL);\r
+       }\r
+}\r
+\r
+void CMainFrame::OnIconize(wxIconizeEvent& event)\r
+{\r
+       if (minimizeToTray) {\r
+               SendToTray();\r
+       }\r
+}\r
+\r
+void CMainFrame::SendToTray()\r
+{\r
+       Hide();\r
+       taskBarIcon->Show();\r
 }\r
 \r
 void CMainFrame::OnMouseEvents(wxMouseEvent& event)\r
@@ -836,16 +859,22 @@ void CMainFrame::OnMenuFileExit(wxCommandEvent& event)
     Close(true);\r
 }\r
 \r
-void CMainFrame::OnMenuOptionsGenerate(wxCommandEvent& event)\r
+void GenerateBitcoins(bool flag)\r
 {\r
-    fGenerateBitcoins = event.IsChecked();\r
+       fGenerateBitcoins = flag;\r
     nTransactionsUpdated++;\r
     CWalletDB().WriteSetting("fGenerateBitcoins", fGenerateBitcoins);\r
-\r
     if (fGenerateBitcoins)\r
         if (_beginthread(ThreadBitcoinMiner, 0, NULL) == -1)\r
             printf("Error: _beginthread(ThreadBitcoinMiner) failed\n");\r
 \r
+    taskBarIcon->UpdateTooltip();\r
+}\r
+\r
+void CMainFrame::OnMenuOptionsGenerate(wxCommandEvent& event)\r
+{\r
+    GenerateBitcoins(event.IsChecked());\r
+\r
     Refresh();\r
     wxPaintEvent eventPaint;\r
     AddPendingEvent(eventPaint);\r
@@ -868,6 +897,10 @@ void CMainFrame::OnMenuHelpAbout(wxCommandEvent& event)
     dialog.ShowModal();\r
 }\r
 \r
+void CMainFrame::OnUpdateMenuGenerate( wxUpdateUIEvent& event ) {\r
+       event.Check(fGenerateBitcoins);\r
+}\r
+\r
 void CMainFrame::OnButtonSend(wxCommandEvent& event)\r
 {\r
     /// debug test\r
@@ -1231,23 +1264,57 @@ void CTxDetailsDialog::OnButtonOK(wxCommandEvent& event)
 \r
 COptionsDialog::COptionsDialog(wxWindow* parent) : COptionsDialogBase(parent)\r
 {\r
-    m_textCtrlTransactionFee->SetValue(FormatMoney(nTransactionFee));\r
     m_buttonOK->SetFocus();\r
+    m_treeCtrl->AddRoot(wxT("Settings"));\r
+    m_treeCtrl->AppendItem(m_treeCtrl->GetRootItem(), wxT("Bitcoin"));\r
+    m_treeCtrl->AppendItem(m_treeCtrl->GetRootItem(), wxT("UI"));\r
+\r
+    panelUI = new COptionsPanelUI(this);\r
+    panelBitcoin = new COptionsPanelBitcoin(this);\r
+    currentPanel = panelBitcoin;\r
+\r
+    panelSizer->Add(panelUI);\r
+    panelSizer->Hide(panelUI);\r
+    panelSizer->Add(panelBitcoin);\r
+    panelSizer->Layout();\r
+\r
 }\r
 \r
-void COptionsDialog::OnKillFocusTransactionFee(wxFocusEvent& event)\r
+void COptionsDialog::MenuSelChanged( wxTreeEvent& event )\r
 {\r
-    int64 nTmp = nTransactionFee;\r
-    ParseMoney(m_textCtrlTransactionFee->GetValue(), nTmp);\r
-    m_textCtrlTransactionFee->SetValue(FormatMoney(nTmp));\r
+       panelSizer->Hide(currentPanel);\r
+       wxString text = m_treeCtrl->GetItemText(event.GetItem());\r
+       if (text == "Bitcoin") {\r
+               panelSizer->Show(panelBitcoin);\r
+               currentPanel = panelBitcoin;\r
+       }\r
+       else {\r
+               panelSizer->Show(panelUI);\r
+               currentPanel = panelUI;\r
+       }\r
+       panelSizer->Layout();\r
 }\r
 \r
 void COptionsDialog::OnButtonOK(wxCommandEvent& event)\r
 {\r
     // nTransactionFee\r
     int64 nPrevTransactionFee = nTransactionFee;\r
-    if (ParseMoney(m_textCtrlTransactionFee->GetValue(), nTransactionFee) && nTransactionFee != nPrevTransactionFee)\r
-        CWalletDB().WriteSetting("nTransactionFee", nTransactionFee);\r
+    if (ParseMoney(panelBitcoin->m_textCtrlTransactionFee->GetValue(), nTransactionFee) && nTransactionFee != nPrevTransactionFee)\r
+       CWalletDB().WriteSetting("transactionFee", nTransactionFee);\r
+\r
+    minimizeToTray = panelUI->m_checkMinToTray->IsChecked();\r
+    closeToTray = panelUI->m_checkCloseToTray->IsChecked();\r
+    startOnSysBoot = panelUI->m_checkStartOnSysBoot->IsChecked();\r
+    askBeforeClosing = panelUI->m_checkAskBeforeClosing->IsChecked();\r
+    alwaysShowTrayIcon = panelUI->m_checkAlwaysShowTray->IsChecked();\r
+\r
+       CWalletDB().WriteSetting("minimizeToTray", minimizeToTray);\r
+       CWalletDB().WriteSetting("closeToTray", closeToTray);\r
+       CWalletDB().WriteSetting("startOnSysBoot", startOnSysBoot);\r
+       CWalletDB().WriteSetting("askBeforeClosing", askBeforeClosing);\r
+       CWalletDB().WriteSetting("alwaysShowTrayIcon", alwaysShowTrayIcon);\r
+\r
+       ApplyUISettings();\r
 \r
     Close();\r
 }\r
@@ -1259,6 +1326,39 @@ void COptionsDialog::OnButtonCancel(wxCommandEvent& event)
 \r
 \r
 \r
+//////////////////////////////////////////////////////////////////////////////\r
+//\r
+// COptionsPanelBitcoin\r
+//\r
+\r
+COptionsPanelBitcoin::COptionsPanelBitcoin(wxWindow* parent) : COptionsPanelBitcoinBase(parent)\r
+{\r
+       m_textCtrlTransactionFee->SetValue(FormatMoney(nTransactionFee));\r
+}\r
+\r
+void COptionsPanelBitcoin::OnKillFocusTransactionFee(wxFocusEvent& event)\r
+{\r
+    int64 nTmp = nTransactionFee;\r
+    ParseMoney(m_textCtrlTransactionFee->GetValue(), nTmp);\r
+    m_textCtrlTransactionFee->SetValue(FormatMoney(nTmp));\r
+}\r
+\r
+\r
+//////////////////////////////////////////////////////////////////////////////\r
+//\r
+// COptionsPanelUI\r
+//\r
+\r
+COptionsPanelUI::COptionsPanelUI(wxWindow* parent) : COptionsPanelUIBase(parent)\r
+{\r
+       m_checkMinToTray->SetValue(minimizeToTray);\r
+       m_checkCloseToTray->SetValue(closeToTray);\r
+       m_checkStartOnSysBoot->SetValue(startOnSysBoot);\r
+       m_checkAskBeforeClosing->SetValue(askBeforeClosing);\r
+       m_checkAlwaysShowTray->SetValue(alwaysShowTrayIcon);\r
+}\r
+\r
+\r
 \r
 \r
 \r
@@ -2862,10 +2962,79 @@ void CEditReviewDialog::GetReview(CReview& review)
 \r
 \r
 \r
+//////////////////////////////////////////////////////////////////////////////\r
+//\r
+// BitcoinTBIcon\r
+//\r
+\r
+enum {\r
+    PU_RESTORE = 10001,\r
+    PU_GENERATE,\r
+    PU_EXIT,\r
+};\r
 \r
+BEGIN_EVENT_TABLE(CBitcoinTBIcon, wxTaskBarIcon)\r
+       EVT_TASKBAR_LEFT_DCLICK  (CBitcoinTBIcon::OnLeftButtonDClick)\r
+       EVT_MENU(PU_RESTORE,    CBitcoinTBIcon::OnMenuRestore)\r
+       EVT_MENU(PU_GENERATE,    CBitcoinTBIcon::OnMenuGenerate)\r
+       EVT_MENU(PU_EXIT,    CBitcoinTBIcon::OnMenuExit)\r
+END_EVENT_TABLE()\r
 \r
+void CBitcoinTBIcon::Show()\r
+{\r
+       string tooltip = "Bitcoin";\r
+       tooltip += fGenerateBitcoins ? " - Generating" : "";\r
+       SetIcon(wxICON(bitcoin), tooltip);\r
+}\r
 \r
+void CBitcoinTBIcon::Hide()\r
+{\r
+       RemoveIcon();\r
+}\r
 \r
+void CBitcoinTBIcon::OnLeftButtonDClick(wxTaskBarIconEvent&)\r
+{\r
+       Restore();\r
+}\r
+\r
+void CBitcoinTBIcon::OnMenuExit(wxCommandEvent&)\r
+{\r
+       pframeMain->Close(true);\r
+}\r
+\r
+void CBitcoinTBIcon::OnMenuGenerate(wxCommandEvent& event)\r
+{\r
+       GenerateBitcoins(event.IsChecked());\r
+       pframeMain->Refresh();\r
+}\r
+\r
+void CBitcoinTBIcon::OnMenuRestore(wxCommandEvent&) {\r
+       Restore();\r
+}\r
+\r
+void CBitcoinTBIcon::Restore() {\r
+    pframeMain->Show();\r
+    pframeMain->Raise();\r
+    if (!alwaysShowTrayIcon)\r
+       Hide();\r
+}\r
+\r
+void CBitcoinTBIcon::UpdateTooltip() {\r
+       if (IsIconInstalled())\r
+               Show();\r
+}\r
+\r
+wxMenu *CBitcoinTBIcon::CreatePopupMenu()\r
+{\r
+    wxMenu *menu = new wxMenu;\r
+    wxMenuItem* generateCheck = menu->AppendCheckItem(PU_GENERATE, _T("Generate Coins"));\r
+    menu->Append(PU_RESTORE, _T("Open Bitcoin"));\r
+    menu->Append(PU_EXIT,    _T("Exit"));\r
+\r
+    generateCheck->Check(fGenerateBitcoins);\r
+\r
+    return menu;\r
+}\r
 \r
 \r
 \r
@@ -3137,6 +3306,9 @@ bool CMyApp::OnInit2()
         }\r
     }\r
 \r
+    taskBarIcon = new CBitcoinTBIcon();\r
+    ApplyUISettings();\r
+\r
     return true;\r
 }\r
 \r
@@ -3214,6 +3386,31 @@ void MainFrameRepaint()
 \r
 \r
 \r
+void ApplyUISettings() {\r
+       // Show the tray icon?\r
+       if (alwaysShowTrayIcon)\r
+               taskBarIcon->Show();\r
+       else\r
+               taskBarIcon->Hide();\r
+\r
+       // Autostart on system startup?\r
+       if (startOnSysBoot) {\r
+               // Get the startup folder path\r
+               char targetPath[ MAX_PATH ];\r
+               SHGetSpecialFolderPath(0, targetPath, CSIDL_STARTUP, 0);\r
+               strcat(targetPath, "\\bitcoin.lnk");\r
+\r
+               // And the current executable path\r
+               char currentPath[ MAX_PATH ];\r
+               GetModuleFileName(NULL, currentPath, _MAX_PATH + 1);\r
+\r
+               // Create the shortcut\r
+               CreateHardLink(targetPath, currentPath, NULL);\r
+       }\r
+}\r
+\r
+\r
+\r
 \r
 \r
 \r

diff --git a/ui.h b/ui.h
index 163554a..5f3897c 100644 (file)
--- a/ui.h
+++ b/ui.h
@@ -27,9 +27,14 @@ extern string FormatTxStatus(const CWalletTx& wtx);
 extern void CrossThreadCall(int nID, void* pdata);\r
 extern void MainFrameRepaint();\r
 extern void Shutdown(void* parg);\r
+void ApplyUISettings();\r
 \r
-\r
-\r
+// UI settings\r
+extern int minimizeToTray;\r
+extern int closeToTray;\r
+extern int startOnSysBoot;\r
+extern int askBeforeClosing;\r
+extern int alwaysShowTrayIcon;\r
 \r
 \r
 \r
@@ -38,6 +43,7 @@ class CMainFrame : public CMainFrameBase
 protected:\r
     // Event handlers\r
     void OnClose(wxCloseEvent& event);\r
+    void OnIconize( wxIconizeEvent& event );\r
     void OnMouseEvents(wxMouseEvent& event);\r
     void OnKeyDown(wxKeyEvent& event) { HandleCtrlA(event); }\r
     void OnIdle(wxIdleEvent& event);\r
@@ -59,6 +65,7 @@ protected:
     void OnListItemActivatedProductsSent(wxListEvent& event);\r
     void OnListItemActivatedOrdersSent(wxListEvent& event);\r
     void OnListItemActivatedOrdersReceived(wxListEvent& event);\r
+    void OnUpdateMenuGenerate( wxUpdateUIEvent& event );\r
        \r
 public:\r
     /** Constructor */\r
@@ -77,6 +84,7 @@ public:
     void InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex=-1);\r
     void RefreshListCtrl();\r
     void RefreshStatus();\r
+    void SendToTray();\r
 };\r
 \r
 \r
@@ -98,14 +106,44 @@ public:
 \r
 \r
 \r
+class COptionsPanelBitcoin : public COptionsPanelBitcoinBase\r
+{\r
+protected:\r
+    // Event handlers\r
+       void OnKillFocusTransactionFee( wxFocusEvent& event );\r
+\r
+public:\r
+    /** Constructor */\r
+    COptionsPanelBitcoin(wxWindow* parent);\r
+};\r
+\r
+\r
+\r
+class COptionsPanelUI : public COptionsPanelUIBase\r
+{\r
+protected:\r
+    // Event handlers\r
+       void OnOptionsChanged( wxCommandEvent& event );\r
+\r
+public:\r
+    /** Constructor */\r
+    COptionsPanelUI(wxWindow* parent);\r
+};\r
+\r
+\r
+\r
 class COptionsDialog : public COptionsDialogBase\r
 {\r
 protected:\r
     // Event handlers\r
-    void OnKillFocusTransactionFee(wxFocusEvent& event);\r
+       void MenuSelChanged( wxTreeEvent& event );\r
     void OnButtonOK(wxCommandEvent& event);\r
     void OnButtonCancel(wxCommandEvent& event);\r
 \r
+    // Panels\r
+    COptionsPanelBitcoin* panelBitcoin;\r
+    COptionsPanelUI* panelUI;\r
+    wxPanel* currentPanel;\r
 public:\r
     /** Constructor */\r
     COptionsDialog(wxWindow* parent);\r
@@ -416,5 +454,22 @@ public:
 \r
 \r
 \r
+class CBitcoinTBIcon : public wxTaskBarIcon\r
+{\r
+protected:\r
+       void Restore();\r
+\r
+       // Event handlers\r
+       void OnLeftButtonDClick(wxTaskBarIconEvent&);\r
+       void OnMenuExit(wxCommandEvent&);\r
+       void OnMenuGenerate(wxCommandEvent&);\r
+       void OnMenuRestore(wxCommandEvent&);\r
 \r
+public:\r
+       void Show();\r
+       void Hide();\r
+       void UpdateTooltip();\r
+       virtual wxMenu *CreatePopupMenu();\r
 \r
+DECLARE_EVENT_TABLE()\r
+};\r

diff --git a/uibase.cpp b/uibase.cpp
index 2972e9a..dcaa697 100644 (file)
--- a/uibase.cpp
+++ b/uibase.cpp
@@ -1,7 +1,3 @@
-// Copyright (c) 2009 Satoshi Nakamoto\r
-// Distributed under the MIT/X11 software license, see the accompanying\r
-// file license.txt or http://www.opensource.org/licenses/mit-license.php.\r
-\r
 ///////////////////////////////////////////////////////////////////////////\r
 // C++ code generated with wxFormBuilder (version Apr 16 2008)\r
 // http://www.wxformbuilder.org/\r
@@ -13,1813 +9,1884 @@
 \r
 ///////////////////////////////////////////////////////////////////////////\r
 \r
-CMainFrameBase::CMainFrameBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style)\r
+CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-    this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));\r
-\r
-    m_menubar = new wxMenuBar(0);\r
-    m_menubar->SetBackgroundColour(wxColour(240, 240, 240));\r
-\r
-    m_menuFile = new wxMenu();\r
-    wxMenuItem* m_menuFileExit;\r
-    m_menuFileExit = new wxMenuItem(m_menuFile, wxID_ANY, wxString(wxT("E&xit")) , wxEmptyString, wxITEM_NORMAL);\r
-    m_menuFile->Append(m_menuFileExit);\r
-\r
-    m_menubar->Append(m_menuFile, wxT("&File"));\r
-\r
-    m_menuOptions = new wxMenu();\r
-    wxMenuItem* m_menuOptionsGenerateBitcoins;\r
-    m_menuOptionsGenerateBitcoins = new wxMenuItem(m_menuOptions, wxID_OPTIONSGENERATEBITCOINS, wxString(wxT("&Generate Coins")) , wxEmptyString, wxITEM_CHECK);\r
-    m_menuOptions->Append(m_menuOptionsGenerateBitcoins);\r
-\r
-    wxMenuItem* m_menuChangeYourAddress;\r
-    m_menuChangeYourAddress = new wxMenuItem(m_menuOptions, wxID_ANY, wxString(wxT("&Change Your Address...")) , wxEmptyString, wxITEM_NORMAL);\r
-    m_menuOptions->Append(m_menuChangeYourAddress);\r
-\r
-    wxMenuItem* m_menuOptionsOptions;\r
-    m_menuOptionsOptions = new wxMenuItem(m_menuOptions, wxID_ANY, wxString(wxT("&Options...")) , wxEmptyString, wxITEM_NORMAL);\r
-    m_menuOptions->Append(m_menuOptionsOptions);\r
-\r
-    m_menubar->Append(m_menuOptions, wxT("&Options"));\r
-\r
-    m_menuHelp = new wxMenu();\r
-    wxMenuItem* m_menuHelpAbout;\r
-    m_menuHelpAbout = new wxMenuItem(m_menuHelp, wxID_ANY, wxString(wxT("&About...")) , wxEmptyString, wxITEM_NORMAL);\r
-    m_menuHelp->Append(m_menuHelpAbout);\r
-\r
-    m_menubar->Append(m_menuHelp, wxT("&Help"));\r
-\r
-    this->SetMenuBar(m_menubar);\r
-\r
-    m_toolBar = this->CreateToolBar(wxTB_FLAT|wxTB_HORZ_TEXT, wxID_ANY);\r
-    m_toolBar->SetToolBitmapSize(wxSize(20,20));\r
-    m_toolBar->SetToolSeparation(1);\r
-    m_toolBar->SetFont(wxFont(wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString));\r
-\r
-    m_toolBar->AddTool(wxID_BUTTONSEND, wxT("&Send Coins"), wxBitmap(wxT("send20"), wxBITMAP_TYPE_RESOURCE), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString);\r
-    m_toolBar->AddTool(wxID_BUTTONRECEIVE, wxT("&Address Book"), wxBitmap(wxT("addressbook20"), wxBITMAP_TYPE_RESOURCE), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString);\r
-    m_toolBar->Realize();\r
-\r
-    m_statusBar = this->CreateStatusBar(1, wxST_SIZEGRIP, wxID_ANY);\r
-    m_statusBar->SetBackgroundColour(wxColour(240, 240, 240));\r
-\r
-    wxBoxSizer* bSizer2;\r
-    bSizer2 = new wxBoxSizer(wxVERTICAL);\r
-\r
-\r
-    bSizer2->Add(0, 2, 0, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer85;\r
-    bSizer85 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_staticText32 = new wxStaticText(this, wxID_ANY, wxT("Your Bitcoin Address:"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText32->Wrap(-1);\r
-    bSizer85->Add(m_staticText32, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5);\r
-\r
-    m_textCtrlAddress = new wxTextCtrl(this, wxID_TEXTCTRLADDRESS, wxEmptyString, wxDefaultPosition, wxSize(250,-1), wxTE_READONLY);\r
-    m_textCtrlAddress->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENU));\r
-\r
-    bSizer85->Add(m_textCtrlAddress, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_buttonCopy = new wxButton(this, wxID_BUTTONCOPY, wxT("&Copy to Clipboard"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);\r
-    bSizer85->Add(m_buttonCopy, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);\r
-\r
-    m_button91 = new wxButton(this, wxID_BUTTONCHANGE, wxT("C&hange..."), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_button91->Hide();\r
-\r
-    bSizer85->Add(m_button91, 0, wxRIGHT, 5);\r
-\r
-\r
-    bSizer85->Add(0, 0, 0, wxEXPAND, 5);\r
-\r
-    bSizer2->Add(bSizer85, 0, wxEXPAND|wxRIGHT|wxLEFT, 5);\r
-\r
-    wxBoxSizer* bSizer3;\r
-    bSizer3 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_panel14 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);\r
-    wxBoxSizer* bSizer66;\r
-    bSizer66 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_staticText41 = new wxStaticText(m_panel14, wxID_ANY, wxT("Balance:"), wxDefaultPosition, wxSize(-1,15), 0);\r
-    m_staticText41->Wrap(-1);\r
-    bSizer66->Add(m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    m_staticTextBalance = new wxStaticText(m_panel14, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(120,15), wxALIGN_RIGHT|wxST_NO_AUTORESIZE);\r
-    m_staticTextBalance->Wrap(-1);\r
-    m_staticTextBalance->SetFont(wxFont(8, 70, 90, 90, false, wxEmptyString));\r
-    m_staticTextBalance->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));\r
-\r
-    bSizer66->Add(m_staticTextBalance, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);\r
-\r
-    m_panel14->SetSizer(bSizer66);\r
-    m_panel14->Layout();\r
-    bSizer66->Fit(m_panel14);\r
-    bSizer3->Add(m_panel14, 1, wxEXPAND|wxALIGN_BOTTOM|wxALL, 5);\r
-\r
-\r
-    bSizer3->Add(0, 0, 0, wxEXPAND, 5);\r
-\r
-    wxString m_choiceFilterChoices[] = { wxT(" All"), wxT(" Sent"), wxT(" Received"), wxT(" In Progress") };\r
-    int m_choiceFilterNChoices = sizeof(m_choiceFilterChoices) / sizeof(wxString);\r
-    m_choiceFilter = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(110,-1), m_choiceFilterNChoices, m_choiceFilterChoices, 0);\r
-    m_choiceFilter->SetSelection(0);\r
-    m_choiceFilter->Hide();\r
-\r
-    bSizer3->Add(m_choiceFilter, 0, wxALIGN_BOTTOM|wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    bSizer2->Add(bSizer3, 0, wxEXPAND, 5);\r
-\r
-    m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_panel7 = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);\r
-    wxBoxSizer* bSizer157;\r
-    bSizer157 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_listCtrl = new wxListCtrl(m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxALWAYS_SHOW_SB);\r
-    bSizer157->Add(m_listCtrl, 1, wxEXPAND|wxALL, 5);\r
-\r
-    m_panel7->SetSizer(bSizer157);\r
-    m_panel7->Layout();\r
-    bSizer157->Fit(m_panel7);\r
-    m_notebook->AddPage(m_panel7, wxT("All Transactions"), false);\r
-\r
-    bSizer2->Add(m_notebook, 1, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer_TabsForFutureUse;\r
-    bSizer_TabsForFutureUse = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_panel9 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);\r
-    m_panel9->Hide();\r
-\r
-    wxBoxSizer* bSizer159;\r
-    bSizer159 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_listCtrlEscrows = new wxListCtrl(m_panel9, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT);\r
-    bSizer159->Add(m_listCtrlEscrows, 1, wxALL|wxEXPAND, 5);\r
-\r
-    m_panel9->SetSizer(bSizer159);\r
-    m_panel9->Layout();\r
-    bSizer159->Fit(m_panel9);\r
-    bSizer_TabsForFutureUse->Add(m_panel9, 1, wxEXPAND | wxALL, 5);\r
-\r
-    m_panel8 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);\r
-    m_panel8->Hide();\r
-\r
-    wxBoxSizer* bSizer158;\r
-    bSizer158 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_listCtrlOrdersSent = new wxListCtrl(m_panel8, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT);\r
-    bSizer158->Add(m_listCtrlOrdersSent, 1, wxALL|wxEXPAND, 5);\r
-\r
-    m_panel8->SetSizer(bSizer158);\r
-    m_panel8->Layout();\r
-    bSizer158->Fit(m_panel8);\r
-    bSizer_TabsForFutureUse->Add(m_panel8, 1, wxEXPAND | wxALL, 5);\r
-\r
-    m_panel10 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);\r
-    m_panel10->Hide();\r
-\r
-    wxBoxSizer* bSizer160;\r
-    bSizer160 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_listCtrlProductsSent = new wxListCtrl(m_panel10, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT);\r
-    bSizer160->Add(m_listCtrlProductsSent, 1, wxALL|wxEXPAND, 5);\r
-\r
-    m_panel10->SetSizer(bSizer160);\r
-    m_panel10->Layout();\r
-    bSizer160->Fit(m_panel10);\r
-    bSizer_TabsForFutureUse->Add(m_panel10, 1, wxEXPAND | wxALL, 5);\r
-\r
-    m_panel11 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);\r
-    m_panel11->Hide();\r
-\r
-    wxBoxSizer* bSizer161;\r
-    bSizer161 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_listCtrlOrdersReceived = new wxListCtrl(m_panel11, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT);\r
-    bSizer161->Add(m_listCtrlOrdersReceived, 1, wxALL|wxEXPAND, 5);\r
-\r
-    m_panel11->SetSizer(bSizer161);\r
-    m_panel11->Layout();\r
-    bSizer161->Fit(m_panel11);\r
-    bSizer_TabsForFutureUse->Add(m_panel11, 1, wxEXPAND | wxALL, 5);\r
-\r
-    bSizer2->Add(bSizer_TabsForFutureUse, 1, wxEXPAND, 5);\r
-\r
-    this->SetSizer(bSizer2);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CMainFrameBase::OnClose));\r
-    this->Connect(wxEVT_IDLE, wxIdleEventHandler(CMainFrameBase::OnIdle));\r
-    this->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MIDDLE_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MOTION, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Connect(wxEVT_PAINT, wxPaintEventHandler(CMainFrameBase::OnPaint));\r
-    this->Connect(m_menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuFileExit));\r
-    this->Connect(m_menuOptionsGenerateBitcoins->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuOptionsGenerate));\r
-    this->Connect(m_menuChangeYourAddress->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuOptionsChangeYourAddress));\r
-    this->Connect(m_menuOptionsOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuOptionsOptions));\r
-    this->Connect(m_menuHelpAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuHelpAbout));\r
-    this->Connect(wxID_BUTTONSEND, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(CMainFrameBase::OnButtonSend));\r
-    this->Connect(wxID_BUTTONRECEIVE, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(CMainFrameBase::OnButtonAddressBook));\r
-    m_textCtrlAddress->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CMainFrameBase::OnKeyDown), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_MIDDLE_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_MOTION, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_SET_FOCUS, wxFocusEventHandler(CMainFrameBase::OnSetFocusAddress), NULL, this);\r
-    m_buttonCopy->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CMainFrameBase::OnButtonCopy), NULL, this);\r
-    m_button91->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CMainFrameBase::OnButtonChange), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler(CMainFrameBase::OnListColBeginDrag), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CMainFrameBase::OnListItemActivatedAllTransactions), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_PAINT, wxPaintEventHandler(CMainFrameBase::OnPaintListCtrl), NULL, this);\r
-    m_listCtrlOrdersSent->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CMainFrameBase::OnListItemActivatedOrdersSent), NULL, this);\r
-    m_listCtrlProductsSent->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CMainFrameBase::OnListItemActivatedProductsSent), NULL, this);\r
-    m_listCtrlOrdersReceived->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CMainFrameBase::OnListItemActivatedOrdersReceived), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );\r
+       \r
+       m_menubar = new wxMenuBar( 0 );\r
+       m_menubar->SetBackgroundColour( wxColour( 240, 240, 240 ) );\r
+       \r
+       m_menuFile = new wxMenu();\r
+       wxMenuItem* m_menuFileExit;\r
+       m_menuFileExit = new wxMenuItem( m_menuFile, wxID_ANY, wxString( wxT("E&xit") ) , wxEmptyString, wxITEM_NORMAL );\r
+       m_menuFile->Append( m_menuFileExit );\r
+       \r
+       m_menubar->Append( m_menuFile, wxT("&File") );\r
+       \r
+       m_menuOptions = new wxMenu();\r
+       wxMenuItem* m_menuOptionsGenerateBitcoins;\r
+       m_menuOptionsGenerateBitcoins = new wxMenuItem( m_menuOptions, wxID_OPTIONSGENERATEBITCOINS, wxString( wxT("&Generate Coins") ) , wxEmptyString, wxITEM_CHECK );\r
+       m_menuOptions->Append( m_menuOptionsGenerateBitcoins );\r
+       \r
+       wxMenuItem* m_menuChangeYourAddress;\r
+       m_menuChangeYourAddress = new wxMenuItem( m_menuOptions, wxID_ANY, wxString( wxT("&Change Your Address...") ) , wxEmptyString, wxITEM_NORMAL );\r
+       m_menuOptions->Append( m_menuChangeYourAddress );\r
+       \r
+       wxMenuItem* m_menuOptionsOptions;\r
+       m_menuOptionsOptions = new wxMenuItem( m_menuOptions, wxID_ANY, wxString( wxT("&Options...") ) , wxEmptyString, wxITEM_NORMAL );\r
+       m_menuOptions->Append( m_menuOptionsOptions );\r
+       \r
+       m_menubar->Append( m_menuOptions, wxT("&Options") );\r
+       \r
+       m_menuHelp = new wxMenu();\r
+       wxMenuItem* m_menuHelpAbout;\r
+       m_menuHelpAbout = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( wxT("&About...") ) , wxEmptyString, wxITEM_NORMAL );\r
+       m_menuHelp->Append( m_menuHelpAbout );\r
+       \r
+       m_menubar->Append( m_menuHelp, wxT("&Help") );\r
+       \r
+       this->SetMenuBar( m_menubar );\r
+       \r
+       m_toolBar = this->CreateToolBar( wxTB_FLAT|wxTB_HORZ_TEXT, wxID_ANY );\r
+       m_toolBar->SetToolBitmapSize( wxSize( 20,20 ) );\r
+       m_toolBar->SetToolSeparation( 1 );\r
+       m_toolBar->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );\r
+       \r
+       m_toolBar->AddTool( wxID_BUTTONSEND, wxT("&Send Coins"), wxBitmap( wxT("send20"), wxBITMAP_TYPE_RESOURCE ), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString );\r
+       m_toolBar->AddTool( wxID_BUTTONRECEIVE, wxT("&Address Book"), wxBitmap( wxT("addressbook20"), wxBITMAP_TYPE_RESOURCE ), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString );\r
+       m_toolBar->Realize();\r
+       \r
+       m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );\r
+       m_statusBar->SetBackgroundColour( wxColour( 240, 240, 240 ) );\r
+       \r
+       wxBoxSizer* bSizer2;\r
+       bSizer2 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       \r
+       bSizer2->Add( 0, 2, 0, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer85;\r
+       bSizer85 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_staticText32 = new wxStaticText( this, wxID_ANY, wxT("Your Bitcoin Address:"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText32->Wrap( -1 );\r
+       bSizer85->Add( m_staticText32, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );\r
+       \r
+       m_textCtrlAddress = new wxTextCtrl( this, wxID_TEXTCTRLADDRESS, wxEmptyString, wxDefaultPosition, wxSize( 250,-1 ), wxTE_READONLY );\r
+       m_textCtrlAddress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_MENU ) );\r
+       \r
+       bSizer85->Add( m_textCtrlAddress, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_buttonCopy = new wxButton( this, wxID_BUTTONCOPY, wxT("&Copy to Clipboard"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );\r
+       bSizer85->Add( m_buttonCopy, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );\r
+       \r
+       m_button91 = new wxButton( this, wxID_BUTTONCHANGE, wxT("C&hange..."), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_button91->Hide();\r
+       \r
+       bSizer85->Add( m_button91, 0, wxRIGHT, 5 );\r
+       \r
+       \r
+       bSizer85->Add( 0, 0, 0, wxEXPAND, 5 );\r
+       \r
+       bSizer2->Add( bSizer85, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       wxBoxSizer* bSizer3;\r
+       bSizer3 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_panel14 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       wxBoxSizer* bSizer66;\r
+       bSizer66 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_staticText41 = new wxStaticText( m_panel14, wxID_ANY, wxT("Balance:"), wxDefaultPosition, wxSize( -1,15 ), 0 );\r
+       m_staticText41->Wrap( -1 );\r
+       bSizer66->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       m_staticTextBalance = new wxStaticText( m_panel14, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 120,15 ), wxALIGN_RIGHT|wxST_NO_AUTORESIZE );\r
+       m_staticTextBalance->Wrap( -1 );\r
+       m_staticTextBalance->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );\r
+       m_staticTextBalance->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );\r
+       \r
+       bSizer66->Add( m_staticTextBalance, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
+       \r
+       m_panel14->SetSizer( bSizer66 );\r
+       m_panel14->Layout();\r
+       bSizer66->Fit( m_panel14 );\r
+       bSizer3->Add( m_panel14, 1, wxEXPAND|wxALIGN_BOTTOM|wxALL, 5 );\r
+       \r
+       \r
+       bSizer3->Add( 0, 0, 0, wxEXPAND, 5 );\r
+       \r
+       wxString m_choiceFilterChoices[] = { wxT(" All"), wxT(" Sent"), wxT(" Received"), wxT(" In Progress") };\r
+       int m_choiceFilterNChoices = sizeof( m_choiceFilterChoices ) / sizeof( wxString );\r
+       m_choiceFilter = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxSize( 110,-1 ), m_choiceFilterNChoices, m_choiceFilterChoices, 0 );\r
+       m_choiceFilter->SetSelection( 0 );\r
+       m_choiceFilter->Hide();\r
+       \r
+       bSizer3->Add( m_choiceFilter, 0, wxALIGN_BOTTOM|wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       bSizer2->Add( bSizer3, 0, wxEXPAND, 5 );\r
+       \r
+       m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_panel7 = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       wxBoxSizer* bSizer157;\r
+       bSizer157 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrl = new wxListCtrl( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxALWAYS_SHOW_SB );\r
+       bSizer157->Add( m_listCtrl, 1, wxEXPAND|wxALL, 5 );\r
+       \r
+       m_panel7->SetSizer( bSizer157 );\r
+       m_panel7->Layout();\r
+       bSizer157->Fit( m_panel7 );\r
+       m_notebook->AddPage( m_panel7, wxT("All Transactions"), false );\r
+       \r
+       bSizer2->Add( m_notebook, 1, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer_TabsForFutureUse;\r
+       bSizer_TabsForFutureUse = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_panel9 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       m_panel9->Hide();\r
+       \r
+       wxBoxSizer* bSizer159;\r
+       bSizer159 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrlEscrows = new wxListCtrl( m_panel9, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT );\r
+       bSizer159->Add( m_listCtrlEscrows, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       m_panel9->SetSizer( bSizer159 );\r
+       m_panel9->Layout();\r
+       bSizer159->Fit( m_panel9 );\r
+       bSizer_TabsForFutureUse->Add( m_panel9, 1, wxEXPAND | wxALL, 5 );\r
+       \r
+       m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       m_panel8->Hide();\r
+       \r
+       wxBoxSizer* bSizer158;\r
+       bSizer158 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrlOrdersSent = new wxListCtrl( m_panel8, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT );\r
+       bSizer158->Add( m_listCtrlOrdersSent, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       m_panel8->SetSizer( bSizer158 );\r
+       m_panel8->Layout();\r
+       bSizer158->Fit( m_panel8 );\r
+       bSizer_TabsForFutureUse->Add( m_panel8, 1, wxEXPAND | wxALL, 5 );\r
+       \r
+       m_panel10 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       m_panel10->Hide();\r
+       \r
+       wxBoxSizer* bSizer160;\r
+       bSizer160 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrlProductsSent = new wxListCtrl( m_panel10, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT );\r
+       bSizer160->Add( m_listCtrlProductsSent, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       m_panel10->SetSizer( bSizer160 );\r
+       m_panel10->Layout();\r
+       bSizer160->Fit( m_panel10 );\r
+       bSizer_TabsForFutureUse->Add( m_panel10, 1, wxEXPAND | wxALL, 5 );\r
+       \r
+       m_panel11 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       m_panel11->Hide();\r
+       \r
+       wxBoxSizer* bSizer161;\r
+       bSizer161 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrlOrdersReceived = new wxListCtrl( m_panel11, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT );\r
+       bSizer161->Add( m_listCtrlOrdersReceived, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       m_panel11->SetSizer( bSizer161 );\r
+       m_panel11->Layout();\r
+       bSizer161->Fit( m_panel11 );\r
+       bSizer_TabsForFutureUse->Add( m_panel11, 1, wxEXPAND | wxALL, 5 );\r
+       \r
+       bSizer2->Add( bSizer_TabsForFutureUse, 1, wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer2 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CMainFrameBase::OnClose ) );\r
+       this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( CMainFrameBase::OnIconize ) );\r
+       this->Connect( wxEVT_IDLE, wxIdleEventHandler( CMainFrameBase::OnIdle ) );\r
+       this->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MOTION, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MIDDLE_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaint ) );\r
+       this->Connect( m_menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuFileExit ) );\r
+       this->Connect( m_menuOptionsGenerateBitcoins->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsGenerate ) );\r
+       this->Connect( m_menuOptionsGenerateBitcoins->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( CMainFrameBase::OnUpdateMenuGenerate ) );\r
+       this->Connect( m_menuChangeYourAddress->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsChangeYourAddress ) );\r
+       this->Connect( m_menuOptionsOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsOptions ) );\r
+       this->Connect( m_menuHelpAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuHelpAbout ) );\r
+       this->Connect( wxID_BUTTONSEND, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonSend ) );\r
+       this->Connect( wxID_BUTTONRECEIVE, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonAddressBook ) );\r
+       m_textCtrlAddress->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CMainFrameBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_MOTION, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_MIDDLE_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( CMainFrameBase::OnSetFocusAddress ), NULL, this );\r
+       m_buttonCopy->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonCopy ), NULL, this );\r
+       m_button91->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonChange ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivatedAllTransactions ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_listCtrlOrdersSent->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivatedOrdersSent ), NULL, this );\r
+       m_listCtrlProductsSent->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivatedProductsSent ), NULL, this );\r
+       m_listCtrlOrdersReceived->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivatedOrdersReceived ), NULL, this );\r
 }\r
 \r
 CMainFrameBase::~CMainFrameBase()\r
 {\r
-    // Disconnect Events\r
-    this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CMainFrameBase::OnClose));\r
-    this->Disconnect(wxEVT_IDLE, wxIdleEventHandler(CMainFrameBase::OnIdle));\r
-    this->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MIDDLE_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_RIGHT_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MOTION, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(CMainFrameBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_PAINT, wxPaintEventHandler(CMainFrameBase::OnPaint));\r
-    this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuFileExit));\r
-    this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuOptionsGenerate));\r
-    this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuOptionsChangeYourAddress));\r
-    this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuOptionsOptions));\r
-    this->Disconnect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CMainFrameBase::OnMenuHelpAbout));\r
-    this->Disconnect(wxID_BUTTONSEND, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(CMainFrameBase::OnButtonSend));\r
-    this->Disconnect(wxID_BUTTONRECEIVE, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(CMainFrameBase::OnButtonAddressBook));\r
-    m_textCtrlAddress->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CMainFrameBase::OnKeyDown), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_MIDDLE_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_RIGHT_UP, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_MOTION, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(CMainFrameBase::OnMouseEventsAddress), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(CMainFrameBase::OnSetFocusAddress), NULL, this);\r
-    m_buttonCopy->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CMainFrameBase::OnButtonCopy), NULL, this);\r
-    m_button91->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CMainFrameBase::OnButtonChange), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler(CMainFrameBase::OnListColBeginDrag), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CMainFrameBase::OnListItemActivatedAllTransactions), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_PAINT, wxPaintEventHandler(CMainFrameBase::OnPaintListCtrl), NULL, this);\r
-    m_listCtrlOrdersSent->Disconnect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CMainFrameBase::OnListItemActivatedOrdersSent), NULL, this);\r
-    m_listCtrlProductsSent->Disconnect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CMainFrameBase::OnListItemActivatedProductsSent), NULL, this);\r
-    m_listCtrlOrdersReceived->Disconnect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CMainFrameBase::OnListItemActivatedOrdersReceived), NULL, this);\r
+       // Disconnect Events\r
+       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CMainFrameBase::OnClose ) );\r
+       this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( CMainFrameBase::OnIconize ) );\r
+       this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( CMainFrameBase::OnIdle ) );\r
+       this->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MOTION, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MIDDLE_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaint ) );\r
+       this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuFileExit ) );\r
+       this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsGenerate ) );\r
+       this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( CMainFrameBase::OnUpdateMenuGenerate ) );\r
+       this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsChangeYourAddress ) );\r
+       this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsOptions ) );\r
+       this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuHelpAbout ) );\r
+       this->Disconnect( wxID_BUTTONSEND, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonSend ) );\r
+       this->Disconnect( wxID_BUTTONRECEIVE, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonAddressBook ) );\r
+       m_textCtrlAddress->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CMainFrameBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_MOTION, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_MIDDLE_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEventsAddress ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( CMainFrameBase::OnSetFocusAddress ), NULL, this );\r
+       m_buttonCopy->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonCopy ), NULL, this );\r
+       m_button91->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonChange ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivatedAllTransactions ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_listCtrlOrdersSent->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivatedOrdersSent ), NULL, this );\r
+       m_listCtrlProductsSent->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivatedProductsSent ), NULL, this );\r
+       m_listCtrlOrdersReceived->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivatedOrdersReceived ), NULL, this );\r
 }\r
 \r
-CTxDetailsDialogBase::CTxDetailsDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style)\r
+CTxDetailsDialogBase::CTxDetailsDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer64;\r
-    bSizer64 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    wxBoxSizer* bSizer66;\r
-    bSizer66 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_htmlWin = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);\r
-    bSizer66->Add(m_htmlWin, 1, wxALL|wxEXPAND, 5);\r
-\r
-    bSizer64->Add(bSizer66, 1, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer65;\r
-    bSizer65 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_buttonOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize(85,25), 0);\r
-    bSizer65->Add(m_buttonOK, 0, wxALL, 5);\r
-\r
-    bSizer64->Add(bSizer65, 0, wxALIGN_RIGHT, 5);\r
-\r
-    this->SetSizer(bSizer64);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CTxDetailsDialogBase::OnButtonOK), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer64;\r
+       bSizer64 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       wxBoxSizer* bSizer66;\r
+       bSizer66 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_htmlWin = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );\r
+       bSizer66->Add( m_htmlWin, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       bSizer64->Add( bSizer66, 1, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer65;\r
+       bSizer65 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_buttonOK = new wxButton( this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize( 85,25 ), 0 );\r
+       bSizer65->Add( m_buttonOK, 0, wxALL, 5 );\r
+       \r
+       bSizer64->Add( bSizer65, 0, wxALIGN_RIGHT, 5 );\r
+       \r
+       this->SetSizer( bSizer64 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CTxDetailsDialogBase::OnButtonOK ), NULL, this );\r
 }\r
 \r
 CTxDetailsDialogBase::~CTxDetailsDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CTxDetailsDialogBase::OnButtonOK), NULL, this);\r
+       // Disconnect Events\r
+       m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CTxDetailsDialogBase::OnButtonOK ), NULL, this );\r
 }\r
 \r
-COptionsDialogBase::COptionsDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style)\r
+COptionsDialogBase::COptionsDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer55;\r
-    bSizer55 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    wxBoxSizer* bSizer57;\r
-    bSizer57 = new wxBoxSizer(wxVERTICAL);\r
-\r
-\r
-    bSizer57->Add(0, 20, 0, wxEXPAND, 5);\r
-\r
-    m_staticText32 = new wxStaticText(this, wxID_ANY, wxT("Optional transaction fee you give to the nodes that process your transactions."), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText32->Wrap(-1);\r
-    bSizer57->Add(m_staticText32, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);\r
-\r
-    wxBoxSizer* bSizer56;\r
-    bSizer56 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_staticText31 = new wxStaticText(this, wxID_ANY, wxT("Transaction fee:"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText31->Wrap(-1);\r
-    bSizer56->Add(m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    m_textCtrlTransactionFee = new wxTextCtrl(this, wxID_TRANSACTIONFEE, wxEmptyString, wxDefaultPosition, wxSize(70,-1), 0);\r
-    bSizer56->Add(m_textCtrlTransactionFee, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    bSizer57->Add(bSizer56, 0, wxEXPAND, 5);\r
-\r
-    bSizer55->Add(bSizer57, 1, wxEXPAND|wxLEFT, 5);\r
-\r
-    wxBoxSizer* bSizer58;\r
-    bSizer58 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_buttonOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize(85,25), 0);\r
-    bSizer58->Add(m_buttonOK, 0, wxALL, 5);\r
-\r
-    m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonCancel->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer58->Add(m_buttonCancel, 0, wxALL, 5);\r
-\r
-    bSizer55->Add(bSizer58, 0, wxALIGN_RIGHT, 5);\r
-\r
-    this->SetSizer(bSizer55);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_textCtrlTransactionFee->Connect(wxEVT_KILL_FOCUS, wxFocusEventHandler(COptionsDialogBase::OnKillFocusTransactionFee), NULL, this);\r
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(COptionsDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(COptionsDialogBase::OnButtonCancel), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer55;\r
+       bSizer55 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       panelSizer = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_treeCtrl = new wxTreeCtrl( this, wxID_ANY, wxDefaultPosition, wxSize( 100,-1 ), wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT|wxTR_LINES_AT_ROOT );\r
+       panelSizer->Add( m_treeCtrl, 0, wxALL|wxEXPAND, 5 );\r
+       \r
+       bSizer55->Add( panelSizer, 1, wxEXPAND, 5 );\r
+       \r
+       m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );\r
+       bSizer55->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );\r
+       \r
+       wxBoxSizer* bSizer58;\r
+       bSizer58 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_buttonOK = new wxButton( this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize( 85,25 ), 0 );\r
+       bSizer58->Add( m_buttonOK, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonCancel->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer58->Add( m_buttonCancel, 0, wxALL, 5 );\r
+       \r
+       m_buttonApply = new wxButton( this, wxID_ANY, wxT("Apply"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonApply->Enable( false );\r
+       m_buttonApply->Hide();\r
+       \r
+       bSizer58->Add( m_buttonApply, 0, wxALL, 5 );\r
+       \r
+       bSizer55->Add( bSizer58, 0, wxALIGN_RIGHT, 5 );\r
+       \r
+       this->SetSizer( bSizer55 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_treeCtrl->Connect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( COptionsDialogBase::MenuSelChanged ), NULL, this );\r
+       m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
 COptionsDialogBase::~COptionsDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_textCtrlTransactionFee->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(COptionsDialogBase::OnKillFocusTransactionFee), NULL, this);\r
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(COptionsDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(COptionsDialogBase::OnButtonCancel), NULL, this);\r
+       // Disconnect Events\r
+       m_treeCtrl->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( COptionsDialogBase::MenuSelChanged ), NULL, this );\r
+       m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
-CAboutDialogBase::CAboutDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style)\r
+CAboutDialogBase::CAboutDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer60;\r
-    bSizer60 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    wxBoxSizer* bSizer62;\r
-    bSizer62 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-\r
-    bSizer62->Add(60, 0, 0, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer63;\r
-    bSizer63 = new wxBoxSizer(wxVERTICAL);\r
-\r
-\r
-    bSizer63->Add(0, 50, 0, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer64;\r
-    bSizer64 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_staticText40 = new wxStaticText(this, wxID_ANY, wxT("Bitcoin "), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText40->Wrap(-1);\r
-    m_staticText40->SetFont(wxFont(10, 74, 90, 92, false, wxT("Tahoma")));\r
-\r
-    bSizer64->Add(m_staticText40, 0, wxALIGN_BOTTOM|wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    m_staticTextVersion = new wxStaticText(this, wxID_ANY, wxT("version"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticTextVersion->Wrap(-1);\r
-    m_staticTextVersion->SetFont(wxFont(10, 74, 90, 90, false, wxT("Tahoma")));\r
-\r
-    bSizer64->Add(m_staticTextVersion, 0, wxALIGN_BOTTOM|wxTOP|wxBOTTOM|wxRIGHT, 5);\r
-\r
-    bSizer63->Add(bSizer64, 0, wxEXPAND, 5);\r
-\r
-\r
-    bSizer63->Add(0, 4, 0, wxEXPAND, 5);\r
-\r
-    m_staticTextMain = new wxStaticText(this, wxID_ANY, wxT("Copyright © 2009 Satoshi Nakamoto.\n\nThis is experimental software.  Do not rely on it for actual financial transactions.\n\nDistributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php.\n\nThis product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com)."), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticTextMain->Wrap(400);\r
-    bSizer63->Add(m_staticTextMain, 0, wxALL, 5);\r
-\r
-\r
-    bSizer63->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    bSizer62->Add(bSizer63, 1, wxEXPAND, 5);\r
-\r
-    bSizer60->Add(bSizer62, 1, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer61;\r
-    bSizer61 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-\r
-    bSizer61->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    m_buttonOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize(85,25), 0);\r
-    bSizer61->Add(m_buttonOK, 0, wxALL, 5);\r
-\r
-    bSizer60->Add(bSizer61, 0, wxALIGN_RIGHT|wxEXPAND, 5);\r
-\r
-    this->SetSizer(bSizer60);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAboutDialogBase::OnButtonOK), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer60;\r
+       bSizer60 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       wxBoxSizer* bSizer62;\r
+       bSizer62 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       \r
+       bSizer62->Add( 60, 0, 0, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer63;\r
+       bSizer63 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       \r
+       bSizer63->Add( 0, 50, 0, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer64;\r
+       bSizer64 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_staticText40 = new wxStaticText( this, wxID_ANY, wxT("Bitcoin "), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText40->Wrap( -1 );\r
+       m_staticText40->SetFont( wxFont( 10, 74, 90, 92, false, wxT("Tahoma") ) );\r
+       \r
+       bSizer64->Add( m_staticText40, 0, wxALIGN_BOTTOM|wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       m_staticTextVersion = new wxStaticText( this, wxID_ANY, wxT("version"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticTextVersion->Wrap( -1 );\r
+       m_staticTextVersion->SetFont( wxFont( 10, 74, 90, 90, false, wxT("Tahoma") ) );\r
+       \r
+       bSizer64->Add( m_staticTextVersion, 0, wxALIGN_BOTTOM|wxTOP|wxBOTTOM|wxRIGHT, 5 );\r
+       \r
+       bSizer63->Add( bSizer64, 0, wxEXPAND, 5 );\r
+       \r
+       \r
+       bSizer63->Add( 0, 4, 0, wxEXPAND, 5 );\r
+       \r
+       m_staticTextMain = new wxStaticText( this, wxID_ANY, wxT("Copyright © 2009 Satoshi Nakamoto.\n\nThis is experimental software.  Do not rely on it for actual financial transactions.\n\nDistributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php.\n\nThis product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com)."), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticTextMain->Wrap( 400 );\r
+       bSizer63->Add( m_staticTextMain, 0, wxALL, 5 );\r
+       \r
+       \r
+       bSizer63->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       bSizer62->Add( bSizer63, 1, wxEXPAND, 5 );\r
+       \r
+       bSizer60->Add( bSizer62, 1, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer61;\r
+       bSizer61 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       \r
+       bSizer61->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       m_buttonOK = new wxButton( this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize( 85,25 ), 0 );\r
+       bSizer61->Add( m_buttonOK, 0, wxALL, 5 );\r
+       \r
+       bSizer60->Add( bSizer61, 0, wxALIGN_RIGHT|wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer60 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAboutDialogBase::OnButtonOK ), NULL, this );\r
 }\r
 \r
 CAboutDialogBase::~CAboutDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAboutDialogBase::OnButtonOK), NULL, this);\r
+       // Disconnect Events\r
+       m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAboutDialogBase::OnButtonOK ), NULL, this );\r
 }\r
 \r
-CSendDialogBase::CSendDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style)\r
+CSendDialogBase::CSendDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer21;\r
-    bSizer21 = new wxBoxSizer(wxVERTICAL);\r
-\r
-\r
-    bSizer21->Add(0, 5, 0, wxEXPAND, 5);\r
-\r
-    wxFlexGridSizer* fgSizer1;\r
-    fgSizer1 = new wxFlexGridSizer(3, 2, 0, 0);\r
-    fgSizer1->AddGrowableCol(1);\r
-    fgSizer1->SetFlexibleDirection(wxBOTH);\r
-    fgSizer1->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);\r
-\r
-\r
-    fgSizer1->Add(0, 0, 0, wxEXPAND, 5);\r
-\r
-    m_staticText14 = new wxStaticText(this, wxID_ANY, wxT("Enter the recipient's IP address (e.g. 123.45.6.7) for online transfer with comments and confirmation, \nor Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) if recipient is not online."), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText14->Wrap(-1);\r
-    fgSizer1->Add(m_staticText14, 0, wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    wxBoxSizer* bSizer47;\r
-    bSizer47 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    bSizer47->SetMinSize(wxSize(70,-1));\r
-\r
-    bSizer47->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    m_bitmapCheckMark = new wxStaticBitmap(this, wxID_ANY, wxICON(check), wxDefaultPosition, wxSize(16,16), 0);\r
-    bSizer47->Add(m_bitmapCheckMark, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_staticText36 = new wxStaticText(this, wxID_ANY, wxT("Pay &To:"), wxDefaultPosition, wxSize(-1,-1), wxALIGN_RIGHT);\r
-    m_staticText36->Wrap(-1);\r
-    bSizer47->Add(m_staticText36, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    fgSizer1->Add(bSizer47, 1, wxEXPAND|wxLEFT, 5);\r
-\r
-    wxBoxSizer* bSizer19;\r
-    bSizer19 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_textCtrlAddress = new wxTextCtrl(this, wxID_TEXTCTRLPAYTO, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    bSizer19->Add(m_textCtrlAddress, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);\r
-\r
-    m_buttonPaste = new wxButton(this, wxID_BUTTONPASTE, wxT("&Paste"), wxDefaultPosition, wxSize(-1,-1), wxBU_EXACTFIT);\r
-    bSizer19->Add(m_buttonPaste, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);\r
-\r
-    m_buttonAddress = new wxButton(this, wxID_BUTTONADDRESSBOOK, wxT(" Address &Book..."), wxDefaultPosition, wxDefaultSize, 0);\r
-    bSizer19->Add(m_buttonAddress, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);\r
-\r
-    fgSizer1->Add(bSizer19, 1, wxEXPAND|wxRIGHT, 5);\r
-\r
-    m_staticText19 = new wxStaticText(this, wxID_ANY, wxT("&Amount:"), wxDefaultPosition, wxSize(-1,-1), wxALIGN_RIGHT);\r
-    m_staticText19->Wrap(-1);\r
-    fgSizer1->Add(m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT, 5);\r
-\r
-    m_textCtrlAmount = new wxTextCtrl(this, wxID_TEXTCTRLAMOUNT, wxEmptyString, wxDefaultPosition, wxSize(145,-1), 0);\r
-    m_textCtrlAmount->SetMaxLength(20);\r
-    m_textCtrlAmount->SetFont(wxFont(wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString));\r
-\r
-    fgSizer1->Add(m_textCtrlAmount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);\r
-\r
-    m_staticText20 = new wxStaticText(this, wxID_ANY, wxT("T&ransfer:"), wxDefaultPosition, wxSize(-1,-1), wxALIGN_RIGHT);\r
-    m_staticText20->Wrap(-1);\r
-    m_staticText20->Hide();\r
-\r
-    fgSizer1->Add(m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    wxString m_choiceTransferTypeChoices[] = { wxT(" Standard") };\r
-    int m_choiceTransferTypeNChoices = sizeof(m_choiceTransferTypeChoices) / sizeof(wxString);\r
-    m_choiceTransferType = new wxChoice(this, wxID_CHOICETRANSFERTYPE, wxDefaultPosition, wxDefaultSize, m_choiceTransferTypeNChoices, m_choiceTransferTypeChoices, 0);\r
-    m_choiceTransferType->SetSelection(0);\r
-    m_choiceTransferType->Hide();\r
-\r
-    fgSizer1->Add(m_choiceTransferType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);\r
-\r
-\r
-    fgSizer1->Add(0, 3, 0, wxEXPAND, 5);\r
-\r
-\r
-    fgSizer1->Add(0, 0, 0, wxEXPAND, 5);\r
-\r
-    bSizer21->Add(fgSizer1, 0, wxEXPAND|wxLEFT, 5);\r
-\r
-    wxBoxSizer* bSizer672;\r
-    bSizer672 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    wxBoxSizer* bSizer681;\r
-    bSizer681 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_staticTextFrom = new wxStaticText(this, wxID_ANY, wxT("&From:"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticTextFrom->Wrap(-1);\r
-    bSizer681->Add(m_staticTextFrom, 0, wxBOTTOM|wxLEFT, 5);\r
-\r
-    m_textCtrlFrom = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    bSizer681->Add(m_textCtrlFrom, 0, wxLEFT|wxEXPAND, 5);\r
-\r
-    bSizer672->Add(bSizer681, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5);\r
-\r
-    bSizer21->Add(bSizer672, 0, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer67;\r
-    bSizer67 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    wxBoxSizer* bSizer68;\r
-    bSizer68 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_staticTextMessage = new wxStaticText(this, wxID_ANY, wxT("&Message:"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticTextMessage->Wrap(-1);\r
-    bSizer68->Add(m_staticTextMessage, 0, wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    m_textCtrlMessage = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);\r
-    bSizer68->Add(m_textCtrlMessage, 1, wxEXPAND|wxLEFT, 5);\r
-\r
-    bSizer67->Add(bSizer68, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5);\r
-\r
-    bSizer21->Add(bSizer67, 1, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer23;\r
-    bSizer23 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-\r
-    bSizer23->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    m_buttonSend = new wxButton(this, wxID_BUTTONSEND, wxT("&Send"), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonSend->SetFont(wxFont(wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString));\r
-    m_buttonSend->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer23->Add(m_buttonSend, 0, wxALL, 5);\r
-\r
-    m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonCancel->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer23->Add(m_buttonCancel, 0, wxALL, 5);\r
-\r
-    bSizer21->Add(bSizer23, 0, wxEXPAND, 5);\r
-\r
-    this->SetSizer(bSizer21);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_textCtrlAddress->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CSendDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlAddress->Connect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(CSendDialogBase::OnTextAddress), NULL, this);\r
-    m_buttonPaste->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendDialogBase::OnButtonPaste), NULL, this);\r
-    m_buttonAddress->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendDialogBase::OnButtonAddressBook), NULL, this);\r
-    m_textCtrlAmount->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CSendDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlAmount->Connect(wxEVT_KILL_FOCUS, wxFocusEventHandler(CSendDialogBase::OnKillFocusAmount), NULL, this);\r
-    m_textCtrlFrom->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CSendDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlMessage->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CSendDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonSend->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendDialogBase::OnButtonSend), NULL, this);\r
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendDialogBase::OnButtonCancel), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer21;\r
+       bSizer21 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       \r
+       bSizer21->Add( 0, 5, 0, wxEXPAND, 5 );\r
+       \r
+       wxFlexGridSizer* fgSizer1;\r
+       fgSizer1 = new wxFlexGridSizer( 3, 2, 0, 0 );\r
+       fgSizer1->AddGrowableCol( 1 );\r
+       fgSizer1->SetFlexibleDirection( wxBOTH );\r
+       fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
+       \r
+       \r
+       fgSizer1->Add( 0, 0, 0, wxEXPAND, 5 );\r
+       \r
+       m_staticText14 = new wxStaticText( this, wxID_ANY, wxT("Enter the recipient's IP address (e.g. 123.45.6.7) for online transfer with comments and confirmation, \nor Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) if recipient is not online."), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText14->Wrap( -1 );\r
+       fgSizer1->Add( m_staticText14, 0, wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       wxBoxSizer* bSizer47;\r
+       bSizer47 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       bSizer47->SetMinSize( wxSize( 70,-1 ) ); \r
+       \r
+       bSizer47->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       m_bitmapCheckMark = new wxStaticBitmap( this, wxID_ANY, wxICON( check ), wxDefaultPosition, wxSize( 16,16 ), 0 );\r
+       bSizer47->Add( m_bitmapCheckMark, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_staticText36 = new wxStaticText( this, wxID_ANY, wxT("Pay &To:"), wxDefaultPosition, wxSize( -1,-1 ), wxALIGN_RIGHT );\r
+       m_staticText36->Wrap( -1 );\r
+       bSizer47->Add( m_staticText36, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       fgSizer1->Add( bSizer47, 1, wxEXPAND|wxLEFT, 5 );\r
+       \r
+       wxBoxSizer* bSizer19;\r
+       bSizer19 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_textCtrlAddress = new wxTextCtrl( this, wxID_TEXTCTRLPAYTO, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer19->Add( m_textCtrlAddress, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
+       \r
+       m_buttonPaste = new wxButton( this, wxID_BUTTONPASTE, wxT("&Paste"), wxDefaultPosition, wxSize( -1,-1 ), wxBU_EXACTFIT );\r
+       bSizer19->Add( m_buttonPaste, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );\r
+       \r
+       m_buttonAddress = new wxButton( this, wxID_BUTTONADDRESSBOOK, wxT(" Address &Book..."), wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer19->Add( m_buttonAddress, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );\r
+       \r
+       fgSizer1->Add( bSizer19, 1, wxEXPAND|wxRIGHT, 5 );\r
+       \r
+       m_staticText19 = new wxStaticText( this, wxID_ANY, wxT("&Amount:"), wxDefaultPosition, wxSize( -1,-1 ), wxALIGN_RIGHT );\r
+       m_staticText19->Wrap( -1 );\r
+       fgSizer1->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT, 5 );\r
+       \r
+       m_textCtrlAmount = new wxTextCtrl( this, wxID_TEXTCTRLAMOUNT, wxEmptyString, wxDefaultPosition, wxSize( 145,-1 ), 0 );\r
+       m_textCtrlAmount->SetMaxLength( 20 ); \r
+       m_textCtrlAmount->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );\r
+       \r
+       fgSizer1->Add( m_textCtrlAmount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
+       \r
+       m_staticText20 = new wxStaticText( this, wxID_ANY, wxT("T&ransfer:"), wxDefaultPosition, wxSize( -1,-1 ), wxALIGN_RIGHT );\r
+       m_staticText20->Wrap( -1 );\r
+       m_staticText20->Hide();\r
+       \r
+       fgSizer1->Add( m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       wxString m_choiceTransferTypeChoices[] = { wxT(" Standard") };\r
+       int m_choiceTransferTypeNChoices = sizeof( m_choiceTransferTypeChoices ) / sizeof( wxString );\r
+       m_choiceTransferType = new wxChoice( this, wxID_CHOICETRANSFERTYPE, wxDefaultPosition, wxDefaultSize, m_choiceTransferTypeNChoices, m_choiceTransferTypeChoices, 0 );\r
+       m_choiceTransferType->SetSelection( 0 );\r
+       m_choiceTransferType->Hide();\r
+       \r
+       fgSizer1->Add( m_choiceTransferType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
+       \r
+       \r
+       fgSizer1->Add( 0, 3, 0, wxEXPAND, 5 );\r
+       \r
+       \r
+       fgSizer1->Add( 0, 0, 0, wxEXPAND, 5 );\r
+       \r
+       bSizer21->Add( fgSizer1, 0, wxEXPAND|wxLEFT, 5 );\r
+       \r
+       wxBoxSizer* bSizer672;\r
+       bSizer672 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       wxBoxSizer* bSizer681;\r
+       bSizer681 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_staticTextFrom = new wxStaticText( this, wxID_ANY, wxT("&From:"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticTextFrom->Wrap( -1 );\r
+       bSizer681->Add( m_staticTextFrom, 0, wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       m_textCtrlFrom = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       bSizer681->Add( m_textCtrlFrom, 0, wxLEFT|wxEXPAND, 5 );\r
+       \r
+       bSizer672->Add( bSizer681, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       bSizer21->Add( bSizer672, 0, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer67;\r
+       bSizer67 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       wxBoxSizer* bSizer68;\r
+       bSizer68 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_staticTextMessage = new wxStaticText( this, wxID_ANY, wxT("&Message:"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticTextMessage->Wrap( -1 );\r
+       bSizer68->Add( m_staticTextMessage, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       m_textCtrlMessage = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );\r
+       bSizer68->Add( m_textCtrlMessage, 1, wxEXPAND|wxLEFT, 5 );\r
+       \r
+       bSizer67->Add( bSizer68, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       bSizer21->Add( bSizer67, 1, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer23;\r
+       bSizer23 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       \r
+       bSizer23->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       m_buttonSend = new wxButton( this, wxID_BUTTONSEND, wxT("&Send"), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonSend->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );\r
+       m_buttonSend->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer23->Add( m_buttonSend, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonCancel->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer23->Add( m_buttonCancel, 0, wxALL, 5 );\r
+       \r
+       bSizer21->Add( bSizer23, 0, wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer21 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_textCtrlAddress->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CSendDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlAddress->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( CSendDialogBase::OnTextAddress ), NULL, this );\r
+       m_buttonPaste->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendDialogBase::OnButtonPaste ), NULL, this );\r
+       m_buttonAddress->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendDialogBase::OnButtonAddressBook ), NULL, this );\r
+       m_textCtrlAmount->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CSendDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlAmount->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( CSendDialogBase::OnKillFocusAmount ), NULL, this );\r
+       m_textCtrlFrom->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CSendDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlMessage->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CSendDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonSend->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendDialogBase::OnButtonSend ), NULL, this );\r
+       m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
 CSendDialogBase::~CSendDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_textCtrlAddress->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CSendDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlAddress->Disconnect(wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(CSendDialogBase::OnTextAddress), NULL, this);\r
-    m_buttonPaste->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendDialogBase::OnButtonPaste), NULL, this);\r
-    m_buttonAddress->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendDialogBase::OnButtonAddressBook), NULL, this);\r
-    m_textCtrlAmount->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CSendDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlAmount->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(CSendDialogBase::OnKillFocusAmount), NULL, this);\r
-    m_textCtrlFrom->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CSendDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlMessage->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CSendDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonSend->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendDialogBase::OnButtonSend), NULL, this);\r
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendDialogBase::OnButtonCancel), NULL, this);\r
+       // Disconnect Events\r
+       m_textCtrlAddress->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CSendDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlAddress->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( CSendDialogBase::OnTextAddress ), NULL, this );\r
+       m_buttonPaste->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendDialogBase::OnButtonPaste ), NULL, this );\r
+       m_buttonAddress->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendDialogBase::OnButtonAddressBook ), NULL, this );\r
+       m_textCtrlAmount->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CSendDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlAmount->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( CSendDialogBase::OnKillFocusAmount ), NULL, this );\r
+       m_textCtrlFrom->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CSendDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlMessage->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CSendDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonSend->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendDialogBase::OnButtonSend ), NULL, this );\r
+       m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
-CSendingDialogBase::CSendingDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style)\r
+CSendingDialogBase::CSendingDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer68;\r
-    bSizer68 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_staticTextSending = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,14), 0);\r
-    m_staticTextSending->Wrap(-1);\r
-    bSizer68->Add(m_staticTextSending, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8);\r
-\r
-    m_textCtrlStatus = new wxTextCtrl(this, wxID_ANY, wxT("\n\nConnecting..."), wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE|wxTE_NO_VSCROLL|wxTE_READONLY|wxNO_BORDER);\r
-    m_textCtrlStatus->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));\r
-\r
-    bSizer68->Add(m_textCtrlStatus, 1, wxEXPAND|wxRIGHT|wxLEFT, 10);\r
-\r
-    wxBoxSizer* bSizer69;\r
-    bSizer69 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-\r
-    bSizer69->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    m_buttonOK = new wxButton(this, wxID_ANY, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonOK->Enable(false);\r
-    m_buttonOK->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer69->Add(m_buttonOK, 0, wxALL, 5);\r
-\r
-    m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonCancel->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer69->Add(m_buttonCancel, 0, wxALL, 5);\r
-\r
-    bSizer68->Add(bSizer69, 0, wxEXPAND, 5);\r
-\r
-    this->SetSizer(bSizer68);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CSendingDialogBase::OnClose));\r
-    this->Connect(wxEVT_PAINT, wxPaintEventHandler(CSendingDialogBase::OnPaint));\r
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendingDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendingDialogBase::OnButtonCancel), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer68;\r
+       bSizer68 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_staticTextSending = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,14 ), 0 );\r
+       m_staticTextSending->Wrap( -1 );\r
+       bSizer68->Add( m_staticTextSending, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 );\r
+       \r
+       m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, wxT("\n\nConnecting..."), wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE|wxTE_NO_VSCROLL|wxTE_READONLY|wxNO_BORDER );\r
+       m_textCtrlStatus->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );\r
+       \r
+       bSizer68->Add( m_textCtrlStatus, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 );\r
+       \r
+       wxBoxSizer* bSizer69;\r
+       bSizer69 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       \r
+       bSizer69->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       m_buttonOK = new wxButton( this, wxID_ANY, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonOK->Enable( false );\r
+       m_buttonOK->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonOK, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonCancel->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonCancel, 0, wxALL, 5 );\r
+       \r
+       bSizer68->Add( bSizer69, 0, wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer68 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CSendingDialogBase::OnClose ) );\r
+       this->Connect( wxEVT_PAINT, wxPaintEventHandler( CSendingDialogBase::OnPaint ) );\r
+       m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendingDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendingDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
 CSendingDialogBase::~CSendingDialogBase()\r
 {\r
-    // Disconnect Events\r
-    this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CSendingDialogBase::OnClose));\r
-    this->Disconnect(wxEVT_PAINT, wxPaintEventHandler(CSendingDialogBase::OnPaint));\r
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendingDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CSendingDialogBase::OnButtonCancel), NULL, this);\r
+       // Disconnect Events\r
+       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CSendingDialogBase::OnClose ) );\r
+       this->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CSendingDialogBase::OnPaint ) );\r
+       m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendingDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CSendingDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
-CYourAddressDialogBase::CYourAddressDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style)\r
+CYourAddressDialogBase::CYourAddressDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer68;\r
-    bSizer68 = new wxBoxSizer(wxVERTICAL);\r
-\r
-\r
-    bSizer68->Add(0, 5, 0, wxEXPAND, 5);\r
-\r
-    m_staticText45 = new wxStaticText(this, wxID_ANY, wxT("These are your Bitcoin addresses for receiving payments.  You may want to give a different one to each sender so you can keep track of who is paying you.  The highlighted address is displayed in the main window."), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText45->Wrap(590);\r
-    bSizer68->Add(m_staticText45, 0, wxALL, 5);\r
-\r
-    m_listCtrl = new wxListCtrl(this, wxID_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_ASCENDING);\r
-    bSizer68->Add(m_listCtrl, 1, wxALL|wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer69;\r
-    bSizer69 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-\r
-    bSizer69->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    m_buttonRename = new wxButton(this, wxID_BUTTONRENAME, wxT("&Edit..."), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonRename->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer69->Add(m_buttonRename, 0, wxALL, 5);\r
-\r
-    m_buttonNew = new wxButton(this, wxID_BUTTONNEW, wxT("&New Address..."), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonNew->SetMinSize(wxSize(110,25));\r
-\r
-    bSizer69->Add(m_buttonNew, 0, wxALL, 5);\r
-\r
-    m_buttonCopy = new wxButton(this, wxID_BUTTONCOPY, wxT("&Copy to Clipboard"), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonCopy->SetMinSize(wxSize(120,25));\r
-\r
-    bSizer69->Add(m_buttonCopy, 0, wxALL, 5);\r
-\r
-    m_buttonOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonOK->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer69->Add(m_buttonOK, 0, wxALL, 5);\r
-\r
-    m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonCancel->Hide();\r
-    m_buttonCancel->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer69->Add(m_buttonCancel, 0, wxALL, 5);\r
-\r
-    bSizer68->Add(bSizer69, 0, wxEXPAND, 5);\r
-\r
-    this->SetSizer(bSizer68);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CYourAddressDialogBase::OnClose));\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEventHandler(CYourAddressDialogBase::OnListEndLabelEdit), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CYourAddressDialogBase::OnListItemActivated), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(CYourAddressDialogBase::OnListItemSelected), NULL, this);\r
-    m_buttonRename->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonRename), NULL, this);\r
-    m_buttonNew->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonNew), NULL, this);\r
-    m_buttonCopy->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonCopy), NULL, this);\r
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonCancel), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer68;\r
+       bSizer68 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       \r
+       bSizer68->Add( 0, 5, 0, wxEXPAND, 5 );\r
+       \r
+       m_staticText45 = new wxStaticText( this, wxID_ANY, wxT("These are your Bitcoin addresses for receiving payments.  You may want to give a different one to each sender so you can keep track of who is paying you.  The highlighted address is displayed in the main window."), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText45->Wrap( 590 );\r
+       bSizer68->Add( m_staticText45, 0, wxALL, 5 );\r
+       \r
+       m_listCtrl = new wxListCtrl( this, wxID_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_ASCENDING );\r
+       bSizer68->Add( m_listCtrl, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer69;\r
+       bSizer69 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       \r
+       bSizer69->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       m_buttonRename = new wxButton( this, wxID_BUTTONRENAME, wxT("&Edit..."), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonRename->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonRename, 0, wxALL, 5 );\r
+       \r
+       m_buttonNew = new wxButton( this, wxID_BUTTONNEW, wxT("&New Address..."), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonNew->SetMinSize( wxSize( 110,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonNew, 0, wxALL, 5 );\r
+       \r
+       m_buttonCopy = new wxButton( this, wxID_BUTTONCOPY, wxT("&Copy to Clipboard"), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonCopy->SetMinSize( wxSize( 120,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonCopy, 0, wxALL, 5 );\r
+       \r
+       m_buttonOK = new wxButton( this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonOK->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonOK, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonCancel->Hide();\r
+       m_buttonCancel->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonCancel, 0, wxALL, 5 );\r
+       \r
+       bSizer68->Add( bSizer69, 0, wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer68 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CYourAddressDialogBase::OnClose ) );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEventHandler( CYourAddressDialogBase::OnListEndLabelEdit ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CYourAddressDialogBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( CYourAddressDialogBase::OnListItemSelected ), NULL, this );\r
+       m_buttonRename->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonRename ), NULL, this );\r
+       m_buttonNew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonNew ), NULL, this );\r
+       m_buttonCopy->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonCopy ), NULL, this );\r
+       m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
 CYourAddressDialogBase::~CYourAddressDialogBase()\r
 {\r
-    // Disconnect Events\r
-    this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CYourAddressDialogBase::OnClose));\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEventHandler(CYourAddressDialogBase::OnListEndLabelEdit), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CYourAddressDialogBase::OnListItemActivated), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(CYourAddressDialogBase::OnListItemSelected), NULL, this);\r
-    m_buttonRename->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonRename), NULL, this);\r
-    m_buttonNew->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonNew), NULL, this);\r
-    m_buttonCopy->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonCopy), NULL, this);\r
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CYourAddressDialogBase::OnButtonCancel), NULL, this);\r
+       // Disconnect Events\r
+       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CYourAddressDialogBase::OnClose ) );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEventHandler( CYourAddressDialogBase::OnListEndLabelEdit ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CYourAddressDialogBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( CYourAddressDialogBase::OnListItemSelected ), NULL, this );\r
+       m_buttonRename->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonRename ), NULL, this );\r
+       m_buttonNew->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonNew ), NULL, this );\r
+       m_buttonCopy->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonCopy ), NULL, this );\r
+       m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CYourAddressDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
-CAddressBookDialogBase::CAddressBookDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style)\r
+CAddressBookDialogBase::CAddressBookDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer68;\r
-    bSizer68 = new wxBoxSizer(wxVERTICAL);\r
-\r
-\r
-    bSizer68->Add(0, 5, 0, wxEXPAND, 5);\r
-\r
-    m_staticText55 = new wxStaticText(this, wxID_ANY, wxT("Bitcoin Address"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText55->Wrap(-1);\r
-    m_staticText55->Hide();\r
-\r
-    bSizer68->Add(m_staticText55, 0, wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_listCtrl = new wxListCtrl(this, wxID_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_ASCENDING);\r
-    bSizer68->Add(m_listCtrl, 1, wxALL|wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer69;\r
-    bSizer69 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-\r
-    bSizer69->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    m_buttonEdit = new wxButton(this, wxID_BUTTONEDIT, wxT("&Edit..."), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonEdit->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer69->Add(m_buttonEdit, 0, wxALL, 5);\r
-\r
-    m_buttonNew = new wxButton(this, wxID_BUTTONNEW, wxT("&New Address..."), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonNew->SetMinSize(wxSize(110,25));\r
-\r
-    bSizer69->Add(m_buttonNew, 0, wxALL, 5);\r
-\r
-    m_buttonDelete = new wxButton(this, wxID_BUTTONDELETE, wxT("&Delete"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonDelete->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer69->Add(m_buttonDelete, 0, wxALL, 5);\r
-\r
-    m_buttonOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonOK->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer69->Add(m_buttonOK, 0, wxALL, 5);\r
-\r
-    m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonCancel->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer69->Add(m_buttonCancel, 0, wxALL, 5);\r
-\r
-    bSizer68->Add(bSizer69, 0, wxEXPAND, 5);\r
-\r
-    this->SetSizer(bSizer68);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CAddressBookDialogBase::OnClose));\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEventHandler(CAddressBookDialogBase::OnListEndLabelEdit), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CAddressBookDialogBase::OnListItemActivated), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(CAddressBookDialogBase::OnListItemSelected), NULL, this);\r
-    m_buttonEdit->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonEdit), NULL, this);\r
-    m_buttonNew->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonNew), NULL, this);\r
-    m_buttonDelete->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonDelete), NULL, this);\r
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonCancel), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer68;\r
+       bSizer68 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       \r
+       bSizer68->Add( 0, 5, 0, wxEXPAND, 5 );\r
+       \r
+       m_staticText55 = new wxStaticText( this, wxID_ANY, wxT("Bitcoin Address"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText55->Wrap( -1 );\r
+       m_staticText55->Hide();\r
+       \r
+       bSizer68->Add( m_staticText55, 0, wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_listCtrl = new wxListCtrl( this, wxID_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_ASCENDING );\r
+       bSizer68->Add( m_listCtrl, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer69;\r
+       bSizer69 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       \r
+       bSizer69->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       m_buttonEdit = new wxButton( this, wxID_BUTTONEDIT, wxT("&Edit..."), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonEdit->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonEdit, 0, wxALL, 5 );\r
+       \r
+       m_buttonNew = new wxButton( this, wxID_BUTTONNEW, wxT("&New Address..."), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonNew->SetMinSize( wxSize( 110,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonNew, 0, wxALL, 5 );\r
+       \r
+       m_buttonDelete = new wxButton( this, wxID_BUTTONDELETE, wxT("&Delete"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonDelete->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonDelete, 0, wxALL, 5 );\r
+       \r
+       m_buttonOK = new wxButton( this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonOK->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonOK, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonCancel->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer69->Add( m_buttonCancel, 0, wxALL, 5 );\r
+       \r
+       bSizer68->Add( bSizer69, 0, wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer68 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CAddressBookDialogBase::OnClose ) );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEventHandler( CAddressBookDialogBase::OnListEndLabelEdit ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CAddressBookDialogBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( CAddressBookDialogBase::OnListItemSelected ), NULL, this );\r
+       m_buttonEdit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonEdit ), NULL, this );\r
+       m_buttonNew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonNew ), NULL, this );\r
+       m_buttonDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonDelete ), NULL, this );\r
+       m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
 CAddressBookDialogBase::~CAddressBookDialogBase()\r
 {\r
-    // Disconnect Events\r
-    this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CAddressBookDialogBase::OnClose));\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEventHandler(CAddressBookDialogBase::OnListEndLabelEdit), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CAddressBookDialogBase::OnListItemActivated), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(CAddressBookDialogBase::OnListItemSelected), NULL, this);\r
-    m_buttonEdit->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonEdit), NULL, this);\r
-    m_buttonNew->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonNew), NULL, this);\r
-    m_buttonDelete->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonDelete), NULL, this);\r
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CAddressBookDialogBase::OnButtonCancel), NULL, this);\r
+       // Disconnect Events\r
+       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CAddressBookDialogBase::OnClose ) );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEventHandler( CAddressBookDialogBase::OnListEndLabelEdit ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CAddressBookDialogBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( CAddressBookDialogBase::OnListItemSelected ), NULL, this );\r
+       m_buttonEdit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonEdit ), NULL, this );\r
+       m_buttonNew->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonNew ), NULL, this );\r
+       m_buttonDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonDelete ), NULL, this );\r
+       m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CAddressBookDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
-CProductsDialogBase::CProductsDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style)\r
+CProductsDialogBase::CProductsDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer22;\r
-    bSizer22 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    wxBoxSizer* bSizer23;\r
-    bSizer23 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_comboBoxCategory = new wxComboBox(this, wxID_ANY, wxT("(Any Category)"), wxDefaultPosition, wxSize(150,-1), 0, NULL, 0);\r
-    m_comboBoxCategory->Append(wxT("(Any Category)"));\r
-    bSizer23->Add(m_comboBoxCategory, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlSearch = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    bSizer23->Add(m_textCtrlSearch, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonSearch = new wxButton(this, wxID_ANY, wxT("&Search"), wxDefaultPosition, wxDefaultSize, 0);\r
-    bSizer23->Add(m_buttonSearch, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    bSizer22->Add(bSizer23, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5);\r
-\r
-    m_listCtrl = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT);\r
-    bSizer22->Add(m_listCtrl, 1, wxALL|wxEXPAND, 5);\r
-\r
-    this->SetSizer(bSizer22);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_comboBoxCategory->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(CProductsDialogBase::OnCombobox), NULL, this);\r
-    m_textCtrlSearch->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CProductsDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonSearch->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CProductsDialogBase::OnButtonSearch), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CProductsDialogBase::OnListItemActivated), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer22;\r
+       bSizer22 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       wxBoxSizer* bSizer23;\r
+       bSizer23 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_comboBoxCategory = new wxComboBox( this, wxID_ANY, wxT("(Any Category)"), wxDefaultPosition, wxSize( 150,-1 ), 0, NULL, 0 );\r
+       m_comboBoxCategory->Append( wxT("(Any Category)") );\r
+       bSizer23->Add( m_comboBoxCategory, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlSearch = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer23->Add( m_textCtrlSearch, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonSearch = new wxButton( this, wxID_ANY, wxT("&Search"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer23->Add( m_buttonSearch, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       bSizer22->Add( bSizer23, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );\r
+       \r
+       m_listCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT );\r
+       bSizer22->Add( m_listCtrl, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer22 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_comboBoxCategory->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( CProductsDialogBase::OnCombobox ), NULL, this );\r
+       m_textCtrlSearch->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CProductsDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonSearch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CProductsDialogBase::OnButtonSearch ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CProductsDialogBase::OnListItemActivated ), NULL, this );\r
 }\r
 \r
 CProductsDialogBase::~CProductsDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_comboBoxCategory->Disconnect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(CProductsDialogBase::OnCombobox), NULL, this);\r
-    m_textCtrlSearch->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CProductsDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonSearch->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CProductsDialogBase::OnButtonSearch), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CProductsDialogBase::OnListItemActivated), NULL, this);\r
+       // Disconnect Events\r
+       m_comboBoxCategory->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( CProductsDialogBase::OnCombobox ), NULL, this );\r
+       m_textCtrlSearch->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CProductsDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonSearch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CProductsDialogBase::OnButtonSearch ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CProductsDialogBase::OnListItemActivated ), NULL, this );\r
 }\r
 \r
-CEditProductDialogBase::CEditProductDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style)\r
+CEditProductDialogBase::CEditProductDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-    this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENU));\r
-\r
-    wxBoxSizer* bSizer20;\r
-    bSizer20 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_scrolledWindow = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL);\r
-    m_scrolledWindow->SetScrollRate(5, 5);\r
-    m_scrolledWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));\r
-\r
-    wxBoxSizer* bSizer21;\r
-    bSizer21 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    wxFlexGridSizer* fgSizer8;\r
-    fgSizer8 = new wxFlexGridSizer(0, 2, 0, 0);\r
-    fgSizer8->AddGrowableCol(1);\r
-    fgSizer8->SetFlexibleDirection(wxBOTH);\r
-    fgSizer8->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);\r
-\r
-    m_staticText106 = new wxStaticText(m_scrolledWindow, wxID_ANY, wxT("Category"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);\r
-    m_staticText106->Wrap(-1);\r
-    fgSizer8->Add(m_staticText106, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    m_comboBoxCategory = new wxComboBox(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0);\r
-    m_comboBoxCategory->SetMinSize(wxSize(180,-1));\r
-\r
-    fgSizer8->Add(m_comboBoxCategory, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_staticText108 = new wxStaticText(m_scrolledWindow, wxID_ANY, wxT("Title"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);\r
-    m_staticText108->Wrap(-1);\r
-    fgSizer8->Add(m_staticText108, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    m_textCtrlTitle = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    fgSizer8->Add(m_textCtrlTitle, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5);\r
-\r
-    m_staticText107 = new wxStaticText(m_scrolledWindow, wxID_ANY, wxT("Price"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);\r
-    m_staticText107->Wrap(-1);\r
-    fgSizer8->Add(m_staticText107, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    m_textCtrlPrice = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlPrice->SetMinSize(wxSize(105,-1));\r
-\r
-    fgSizer8->Add(m_textCtrlPrice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    bSizer21->Add(fgSizer8, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_staticText22 = new wxStaticText(m_scrolledWindow, wxID_ANY, wxT("Page 1: Description"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText22->Wrap(-1);\r
-    bSizer21->Add(m_staticText22, 0, wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlDescription = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);\r
-    m_textCtrlDescription->SetMinSize(wxSize(-1,170));\r
-\r
-    bSizer21->Add(m_textCtrlDescription, 0, wxALL|wxEXPAND, 5);\r
-\r
-    m_staticText23 = new wxStaticText(m_scrolledWindow, wxID_ANY, wxT("Page 2: Order Form"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText23->Wrap(-1);\r
-    bSizer21->Add(m_staticText23, 0, wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlInstructions = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);\r
-    m_textCtrlInstructions->SetMinSize(wxSize(-1,120));\r
-\r
-    bSizer21->Add(m_textCtrlInstructions, 0, wxEXPAND|wxALL, 5);\r
-\r
-    fgSizer5 = new wxFlexGridSizer(0, 3, 0, 0);\r
-    fgSizer5->AddGrowableCol(1);\r
-    fgSizer5->SetFlexibleDirection(wxBOTH);\r
-    fgSizer5->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);\r
-\r
-    m_staticText24 = new wxStaticText(m_scrolledWindow, wxID_ANY, wxT("Label"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText24->Wrap(-1);\r
-    fgSizer5->Add(m_staticText24, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_staticText25 = new wxStaticText(m_scrolledWindow, wxID_ANY, wxT("Comma separated list of choices, or leave blank for text field"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText25->Wrap(-1);\r
-    fgSizer5->Add(m_staticText25, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-\r
-    fgSizer5->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    m_textCtrlLabel0 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel0->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel0, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField0 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField0, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel0 = new wxButton(m_scrolledWindow, wxID_DEL0, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel0, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlLabel1 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel1->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField1 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField1, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel1 = new wxButton(m_scrolledWindow, wxID_DEL1, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel2 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel2->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField2 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField2, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel2 = new wxButton(m_scrolledWindow, wxID_DEL2, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel3 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel3->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField3 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField3, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel3 = new wxButton(m_scrolledWindow, wxID_DEL3, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel4 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel4->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel4, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField4 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField4, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel4 = new wxButton(m_scrolledWindow, wxID_DEL4, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel4, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel5 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel5->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel5, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField5 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField5, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel5 = new wxButton(m_scrolledWindow, wxID_DEL5, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel6 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel6->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField6 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField6, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel6 = new wxButton(m_scrolledWindow, wxID_DEL6, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel6, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel7 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel7->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel7, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField7 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField7, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel7 = new wxButton(m_scrolledWindow, wxID_DEL7, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel8 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel8->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel8, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField8 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField8, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel8 = new wxButton(m_scrolledWindow, wxID_DEL8, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel8, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel9 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel9->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField9 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField9, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel9 = new wxButton(m_scrolledWindow, wxID_DEL9, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel10 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel10->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField10 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField10, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel10 = new wxButton(m_scrolledWindow, wxID_DEL10, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel11 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel11->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel11, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField11 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField11, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel11 = new wxButton(m_scrolledWindow, wxID_DEL11, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel12 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel12->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField12 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField12, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel12 = new wxButton(m_scrolledWindow, wxID_DEL12, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel13 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel13->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField13 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField13, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel13 = new wxButton(m_scrolledWindow, wxID_DEL13, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel14 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel14->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel14, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField14 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField14, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel14 = new wxButton(m_scrolledWindow, wxID_DEL14, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel15 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel15->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel15, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField15 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField15, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel15 = new wxButton(m_scrolledWindow, wxID_DEL15, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel16 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel16->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField16 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField16, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel16 = new wxButton(m_scrolledWindow, wxID_DEL16, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel16, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel17 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel17->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel17, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField17 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField17, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel17 = new wxButton(m_scrolledWindow, wxID_DEL17, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel17, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel18 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel18->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel18, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField18 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField18, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel18 = new wxButton(m_scrolledWindow, wxID_DEL18, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlLabel19 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_textCtrlLabel19->SetMinSize(wxSize(150,-1));\r
-\r
-    fgSizer5->Add(m_textCtrlLabel19, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_textCtrlField19 = new wxTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,-1), 0);\r
-    fgSizer5->Add(m_textCtrlField19, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);\r
-\r
-    m_buttonDel19 = new wxButton(m_scrolledWindow, wxID_DEL19, wxT("Delete"), wxDefaultPosition, wxSize(60,20), 0);\r
-    fgSizer5->Add(m_buttonDel19, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5);\r
-\r
-    bSizer21->Add(fgSizer5, 0, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer25;\r
-    bSizer25 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_buttonAddField = new wxButton(m_scrolledWindow, wxID_ANY, wxT("&Add Field"), wxDefaultPosition, wxDefaultSize, 0);\r
-    bSizer25->Add(m_buttonAddField, 0, wxALL, 5);\r
-\r
-    bSizer21->Add(bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5);\r
-\r
-    m_scrolledWindow->SetSizer(bSizer21);\r
-    m_scrolledWindow->Layout();\r
-    bSizer21->Fit(m_scrolledWindow);\r
-    bSizer20->Add(m_scrolledWindow, 1, wxEXPAND|wxALL, 5);\r
-\r
-    wxBoxSizer* bSizer26;\r
-    bSizer26 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_buttonOK = new wxButton(this, wxID_BUTTONSEND, wxT("&Send"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonOK->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer26->Add(m_buttonOK, 0, wxALL, 5);\r
-\r
-    m_buttonPreview = new wxButton(this, wxID_BUTTONPREVIEW, wxT("&Preview"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonPreview->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer26->Add(m_buttonPreview, 0, wxALL, 5);\r
-\r
-    m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonCancel->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer26->Add(m_buttonCancel, 0, wxALL, 5);\r
-\r
-    bSizer20->Add(bSizer26, 0, wxALIGN_RIGHT, 5);\r
-\r
-    this->SetSizer(bSizer20);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_textCtrlTitle->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlPrice->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlDescription->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlInstructions->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlLabel0->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField0->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel0->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel0), NULL, this);\r
-    m_textCtrlLabel1->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField1->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel1->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel1), NULL, this);\r
-    m_textCtrlLabel2->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField2->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel2->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel2), NULL, this);\r
-    m_textCtrlLabel3->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField3->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel3->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel3), NULL, this);\r
-    m_textCtrlLabel4->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField4->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel4->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel4), NULL, this);\r
-    m_textCtrlLabel5->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField5->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel5->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel5), NULL, this);\r
-    m_textCtrlLabel6->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField6->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel6->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel6), NULL, this);\r
-    m_textCtrlLabel7->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField7->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel7->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel7), NULL, this);\r
-    m_textCtrlLabel8->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField8->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel8->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel8), NULL, this);\r
-    m_textCtrlLabel9->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField9->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel9->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel9), NULL, this);\r
-    m_textCtrlLabel10->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField10->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel10->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel10), NULL, this);\r
-    m_textCtrlLabel11->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField11->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel11->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel11), NULL, this);\r
-    m_textCtrlLabel12->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField12->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel12->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel12), NULL, this);\r
-    m_textCtrlLabel13->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField13->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel13->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel13), NULL, this);\r
-    m_textCtrlLabel14->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField14->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel14->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel14), NULL, this);\r
-    m_textCtrlLabel15->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField15->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel15->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel15), NULL, this);\r
-    m_textCtrlLabel16->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField16->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel16->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel16), NULL, this);\r
-    m_textCtrlLabel17->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField17->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel17->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel17), NULL, this);\r
-    m_textCtrlLabel18->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField18->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel18->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel18), NULL, this);\r
-    m_textCtrlLabel19->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField19->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel19->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel19), NULL, this);\r
-    m_buttonAddField->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonAddField), NULL, this);\r
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonSend), NULL, this);\r
-    m_buttonPreview->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonPreview), NULL, this);\r
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonCancel), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_MENU ) );\r
+       \r
+       wxBoxSizer* bSizer20;\r
+       bSizer20 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_scrolledWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL );\r
+       m_scrolledWindow->SetScrollRate( 5, 5 );\r
+       m_scrolledWindow->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );\r
+       \r
+       wxBoxSizer* bSizer21;\r
+       bSizer21 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       wxFlexGridSizer* fgSizer8;\r
+       fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );\r
+       fgSizer8->AddGrowableCol( 1 );\r
+       fgSizer8->SetFlexibleDirection( wxBOTH );\r
+       fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
+       \r
+       m_staticText106 = new wxStaticText( m_scrolledWindow, wxID_ANY, wxT("Category"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
+       m_staticText106->Wrap( -1 );\r
+       fgSizer8->Add( m_staticText106, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       m_comboBoxCategory = new wxComboBox( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); \r
+       m_comboBoxCategory->SetMinSize( wxSize( 180,-1 ) );\r
+       \r
+       fgSizer8->Add( m_comboBoxCategory, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_staticText108 = new wxStaticText( m_scrolledWindow, wxID_ANY, wxT("Title"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
+       m_staticText108->Wrap( -1 );\r
+       fgSizer8->Add( m_staticText108, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       m_textCtrlTitle = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       fgSizer8->Add( m_textCtrlTitle, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );\r
+       \r
+       m_staticText107 = new wxStaticText( m_scrolledWindow, wxID_ANY, wxT("Price"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );\r
+       m_staticText107->Wrap( -1 );\r
+       fgSizer8->Add( m_staticText107, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       m_textCtrlPrice = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlPrice->SetMinSize( wxSize( 105,-1 ) );\r
+       \r
+       fgSizer8->Add( m_textCtrlPrice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       bSizer21->Add( fgSizer8, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_staticText22 = new wxStaticText( m_scrolledWindow, wxID_ANY, wxT("Page 1: Description"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText22->Wrap( -1 );\r
+       bSizer21->Add( m_staticText22, 0, wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlDescription = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );\r
+       m_textCtrlDescription->SetMinSize( wxSize( -1,170 ) );\r
+       \r
+       bSizer21->Add( m_textCtrlDescription, 0, wxALL|wxEXPAND, 5 );\r
+       \r
+       m_staticText23 = new wxStaticText( m_scrolledWindow, wxID_ANY, wxT("Page 2: Order Form"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText23->Wrap( -1 );\r
+       bSizer21->Add( m_staticText23, 0, wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlInstructions = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );\r
+       m_textCtrlInstructions->SetMinSize( wxSize( -1,120 ) );\r
+       \r
+       bSizer21->Add( m_textCtrlInstructions, 0, wxEXPAND|wxALL, 5 );\r
+       \r
+       fgSizer5 = new wxFlexGridSizer( 0, 3, 0, 0 );\r
+       fgSizer5->AddGrowableCol( 1 );\r
+       fgSizer5->SetFlexibleDirection( wxBOTH );\r
+       fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
+       \r
+       m_staticText24 = new wxStaticText( m_scrolledWindow, wxID_ANY, wxT("Label"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText24->Wrap( -1 );\r
+       fgSizer5->Add( m_staticText24, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_staticText25 = new wxStaticText( m_scrolledWindow, wxID_ANY, wxT("Comma separated list of choices, or leave blank for text field"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText25->Wrap( -1 );\r
+       fgSizer5->Add( m_staticText25, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       \r
+       fgSizer5->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       m_textCtrlLabel0 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel0->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel0, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField0 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField0, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel0 = new wxButton( m_scrolledWindow, wxID_DEL0, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel0, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlLabel1 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel1->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField1 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField1, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel1 = new wxButton( m_scrolledWindow, wxID_DEL1, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel2 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel2->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField2 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField2, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel2 = new wxButton( m_scrolledWindow, wxID_DEL2, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel3 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel3->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField3 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField3, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel3 = new wxButton( m_scrolledWindow, wxID_DEL3, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel4 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel4->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel4, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField4 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField4, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel4 = new wxButton( m_scrolledWindow, wxID_DEL4, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel4, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel5 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel5->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel5, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField5 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField5, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel5 = new wxButton( m_scrolledWindow, wxID_DEL5, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel6 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel6->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField6 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField6, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel6 = new wxButton( m_scrolledWindow, wxID_DEL6, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel6, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel7 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel7->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel7, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField7 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField7, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel7 = new wxButton( m_scrolledWindow, wxID_DEL7, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel8 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel8->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel8, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField8 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField8, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel8 = new wxButton( m_scrolledWindow, wxID_DEL8, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel8, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel9 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel9->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField9 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField9, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel9 = new wxButton( m_scrolledWindow, wxID_DEL9, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel10 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel10->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField10 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField10, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel10 = new wxButton( m_scrolledWindow, wxID_DEL10, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel11 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel11->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel11, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField11 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField11, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel11 = new wxButton( m_scrolledWindow, wxID_DEL11, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel12 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel12->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField12 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField12, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel12 = new wxButton( m_scrolledWindow, wxID_DEL12, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel13 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel13->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField13 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField13, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel13 = new wxButton( m_scrolledWindow, wxID_DEL13, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel14 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel14->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel14, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField14 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField14, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel14 = new wxButton( m_scrolledWindow, wxID_DEL14, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel15 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel15->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel15, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField15 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField15, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel15 = new wxButton( m_scrolledWindow, wxID_DEL15, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel16 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel16->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField16 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField16, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel16 = new wxButton( m_scrolledWindow, wxID_DEL16, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel16, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel17 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel17->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel17, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField17 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField17, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel17 = new wxButton( m_scrolledWindow, wxID_DEL17, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel17, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel18 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel18->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel18, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField18 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField18, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel18 = new wxButton( m_scrolledWindow, wxID_DEL18, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlLabel19 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_textCtrlLabel19->SetMinSize( wxSize( 150,-1 ) );\r
+       \r
+       fgSizer5->Add( m_textCtrlLabel19, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_textCtrlField19 = new wxTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       fgSizer5->Add( m_textCtrlField19, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       m_buttonDel19 = new wxButton( m_scrolledWindow, wxID_DEL19, wxT("Delete"), wxDefaultPosition, wxSize( 60,20 ), 0 );\r
+       fgSizer5->Add( m_buttonDel19, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       bSizer21->Add( fgSizer5, 0, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer25;\r
+       bSizer25 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_buttonAddField = new wxButton( m_scrolledWindow, wxID_ANY, wxT("&Add Field"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer25->Add( m_buttonAddField, 0, wxALL, 5 );\r
+       \r
+       bSizer21->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );\r
+       \r
+       m_scrolledWindow->SetSizer( bSizer21 );\r
+       m_scrolledWindow->Layout();\r
+       bSizer21->Fit( m_scrolledWindow );\r
+       bSizer20->Add( m_scrolledWindow, 1, wxEXPAND|wxALL, 5 );\r
+       \r
+       wxBoxSizer* bSizer26;\r
+       bSizer26 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_buttonOK = new wxButton( this, wxID_BUTTONSEND, wxT("&Send"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonOK->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer26->Add( m_buttonOK, 0, wxALL, 5 );\r
+       \r
+       m_buttonPreview = new wxButton( this, wxID_BUTTONPREVIEW, wxT("&Preview"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonPreview->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer26->Add( m_buttonPreview, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonCancel->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer26->Add( m_buttonCancel, 0, wxALL, 5 );\r
+       \r
+       bSizer20->Add( bSizer26, 0, wxALIGN_RIGHT, 5 );\r
+       \r
+       this->SetSizer( bSizer20 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_textCtrlTitle->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlPrice->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlDescription->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlInstructions->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlLabel0->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField0->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel0->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel0 ), NULL, this );\r
+       m_textCtrlLabel1->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField1->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel1 ), NULL, this );\r
+       m_textCtrlLabel2->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField2->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel2 ), NULL, this );\r
+       m_textCtrlLabel3->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField3->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel3->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel3 ), NULL, this );\r
+       m_textCtrlLabel4->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField4->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel4 ), NULL, this );\r
+       m_textCtrlLabel5->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField5->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel5 ), NULL, this );\r
+       m_textCtrlLabel6->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField6->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel6 ), NULL, this );\r
+       m_textCtrlLabel7->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField7->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel7->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel7 ), NULL, this );\r
+       m_textCtrlLabel8->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField8->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel8 ), NULL, this );\r
+       m_textCtrlLabel9->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField9->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel9 ), NULL, this );\r
+       m_textCtrlLabel10->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField10->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel10 ), NULL, this );\r
+       m_textCtrlLabel11->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField11->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel11->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel11 ), NULL, this );\r
+       m_textCtrlLabel12->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField12->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel12->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel12 ), NULL, this );\r
+       m_textCtrlLabel13->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField13->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel13->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel13 ), NULL, this );\r
+       m_textCtrlLabel14->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField14->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel14->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel14 ), NULL, this );\r
+       m_textCtrlLabel15->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField15->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel15->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel15 ), NULL, this );\r
+       m_textCtrlLabel16->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField16->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel16 ), NULL, this );\r
+       m_textCtrlLabel17->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField17->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel17->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel17 ), NULL, this );\r
+       m_textCtrlLabel18->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField18->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel18->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel18 ), NULL, this );\r
+       m_textCtrlLabel19->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField19->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel19->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel19 ), NULL, this );\r
+       m_buttonAddField->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonAddField ), NULL, this );\r
+       m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonSend ), NULL, this );\r
+       m_buttonPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonPreview ), NULL, this );\r
+       m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
 CEditProductDialogBase::~CEditProductDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_textCtrlTitle->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlPrice->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlDescription->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlInstructions->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlLabel0->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField0->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel0->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel0), NULL, this);\r
-    m_textCtrlLabel1->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField1->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel1->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel1), NULL, this);\r
-    m_textCtrlLabel2->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField2->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel2->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel2), NULL, this);\r
-    m_textCtrlLabel3->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField3->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel3->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel3), NULL, this);\r
-    m_textCtrlLabel4->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField4->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel4->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel4), NULL, this);\r
-    m_textCtrlLabel5->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField5->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel5->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel5), NULL, this);\r
-    m_textCtrlLabel6->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField6->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel6->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel6), NULL, this);\r
-    m_textCtrlLabel7->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField7->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel7->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel7), NULL, this);\r
-    m_textCtrlLabel8->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField8->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel8->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel8), NULL, this);\r
-    m_textCtrlLabel9->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField9->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel9->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel9), NULL, this);\r
-    m_textCtrlLabel10->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField10->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel10->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel10), NULL, this);\r
-    m_textCtrlLabel11->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField11->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel11->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel11), NULL, this);\r
-    m_textCtrlLabel12->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField12->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel12->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel12), NULL, this);\r
-    m_textCtrlLabel13->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField13->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel13->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel13), NULL, this);\r
-    m_textCtrlLabel14->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField14->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel14->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel14), NULL, this);\r
-    m_textCtrlLabel15->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField15->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel15->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel15), NULL, this);\r
-    m_textCtrlLabel16->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField16->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel16->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel16), NULL, this);\r
-    m_textCtrlLabel17->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField17->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel17->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel17), NULL, this);\r
-    m_textCtrlLabel18->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField18->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel18->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel18), NULL, this);\r
-    m_textCtrlLabel19->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrlField19->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditProductDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonDel19->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonDel19), NULL, this);\r
-    m_buttonAddField->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonAddField), NULL, this);\r
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonSend), NULL, this);\r
-    m_buttonPreview->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonPreview), NULL, this);\r
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditProductDialogBase::OnButtonCancel), NULL, this);\r
+       // Disconnect Events\r
+       m_textCtrlTitle->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlPrice->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlDescription->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlInstructions->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlLabel0->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField0->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel0->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel0 ), NULL, this );\r
+       m_textCtrlLabel1->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField1->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel1 ), NULL, this );\r
+       m_textCtrlLabel2->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField2->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel2->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel2 ), NULL, this );\r
+       m_textCtrlLabel3->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField3->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel3->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel3 ), NULL, this );\r
+       m_textCtrlLabel4->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField4->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel4 ), NULL, this );\r
+       m_textCtrlLabel5->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField5->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel5 ), NULL, this );\r
+       m_textCtrlLabel6->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField6->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel6 ), NULL, this );\r
+       m_textCtrlLabel7->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField7->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel7->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel7 ), NULL, this );\r
+       m_textCtrlLabel8->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField8->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel8 ), NULL, this );\r
+       m_textCtrlLabel9->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField9->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel9 ), NULL, this );\r
+       m_textCtrlLabel10->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField10->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel10 ), NULL, this );\r
+       m_textCtrlLabel11->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField11->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel11->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel11 ), NULL, this );\r
+       m_textCtrlLabel12->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField12->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel12->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel12 ), NULL, this );\r
+       m_textCtrlLabel13->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField13->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel13->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel13 ), NULL, this );\r
+       m_textCtrlLabel14->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField14->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel14->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel14 ), NULL, this );\r
+       m_textCtrlLabel15->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField15->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel15->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel15 ), NULL, this );\r
+       m_textCtrlLabel16->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField16->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel16 ), NULL, this );\r
+       m_textCtrlLabel17->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField17->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel17->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel17 ), NULL, this );\r
+       m_textCtrlLabel18->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField18->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel18->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel18 ), NULL, this );\r
+       m_textCtrlLabel19->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrlField19->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditProductDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonDel19->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonDel19 ), NULL, this );\r
+       m_buttonAddField->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonAddField ), NULL, this );\r
+       m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonSend ), NULL, this );\r
+       m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonPreview ), NULL, this );\r
+       m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditProductDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
-CViewProductDialogBase::CViewProductDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style)\r
+CViewProductDialogBase::CViewProductDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-    this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENU));\r
-\r
-    wxBoxSizer* bSizer20;\r
-    bSizer20 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    wxBoxSizer* bSizer116;\r
-    bSizer116 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_htmlWinReviews = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);\r
-    m_htmlWinReviews->Hide();\r
-\r
-    bSizer116->Add(m_htmlWinReviews, 1, wxALL|wxEXPAND, 5);\r
-\r
-    m_scrolledWindow = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL);\r
-    m_scrolledWindow->SetScrollRate(5, 5);\r
-    m_scrolledWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));\r
-\r
-    wxBoxSizer* bSizer21;\r
-    bSizer21 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_richTextHeading = new wxRichTextCtrl(m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1,50), wxTE_READONLY|wxNO_BORDER);\r
-    bSizer21->Add(m_richTextHeading, 0, wxEXPAND, 5);\r
-\r
-    m_staticTextInstructions = new wxStaticText(m_scrolledWindow, wxID_ANY, wxT("Order Form instructions here\nmultiple lines\n1\n2\n3\n4\n5\n6"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticTextInstructions->Wrap(-1);\r
-    bSizer21->Add(m_staticTextInstructions, 0, wxALL|wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer25;\r
-    bSizer25 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_buttonSubmitForm = new wxButton(m_scrolledWindow, wxID_BUTTONSAMPLE, wxT("&Submit"), wxDefaultPosition, wxDefaultSize, 0);\r
-    bSizer25->Add(m_buttonSubmitForm, 0, wxALL, 5);\r
-\r
-    m_buttonCancelForm = new wxButton(m_scrolledWindow, wxID_CANCEL2, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0);\r
-    bSizer25->Add(m_buttonCancelForm, 0, wxALL, 5);\r
-\r
-    bSizer21->Add(bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5);\r
-\r
-    m_scrolledWindow->SetSizer(bSizer21);\r
-    m_scrolledWindow->Layout();\r
-    bSizer21->Fit(m_scrolledWindow);\r
-    bSizer116->Add(m_scrolledWindow, 1, wxEXPAND|wxALL, 5);\r
-\r
-    bSizer20->Add(bSizer116, 1, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer26;\r
-    bSizer26 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_buttonBack = new wxButton(this, wxID_BUTTONBACK, wxT("< &Back  "), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonBack->Enable(false);\r
-    m_buttonBack->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer26->Add(m_buttonBack, 0, wxALL, 5);\r
-\r
-    m_buttonNext = new wxButton(this, wxID_BUTTONNEXT, wxT("  &Next >"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonNext->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer26->Add(m_buttonNext, 0, wxALL, 5);\r
-\r
-    m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonCancel->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer26->Add(m_buttonCancel, 0, wxALL, 5);\r
-\r
-    bSizer20->Add(bSizer26, 0, wxALIGN_RIGHT, 5);\r
-\r
-    this->SetSizer(bSizer20);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_buttonSubmitForm->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonSubmitForm), NULL, this);\r
-    m_buttonCancelForm->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonCancelForm), NULL, this);\r
-    m_buttonBack->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonBack), NULL, this);\r
-    m_buttonNext->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonNext), NULL, this);\r
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonCancel), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_MENU ) );\r
+       \r
+       wxBoxSizer* bSizer20;\r
+       bSizer20 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       wxBoxSizer* bSizer116;\r
+       bSizer116 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_htmlWinReviews = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );\r
+       m_htmlWinReviews->Hide();\r
+       \r
+       bSizer116->Add( m_htmlWinReviews, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       m_scrolledWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL );\r
+       m_scrolledWindow->SetScrollRate( 5, 5 );\r
+       m_scrolledWindow->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );\r
+       \r
+       wxBoxSizer* bSizer21;\r
+       bSizer21 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_richTextHeading = new wxRichTextCtrl( m_scrolledWindow, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,50 ), wxTE_READONLY|wxNO_BORDER );\r
+       bSizer21->Add( m_richTextHeading, 0, wxEXPAND, 5 );\r
+       \r
+       m_staticTextInstructions = new wxStaticText( m_scrolledWindow, wxID_ANY, wxT("Order Form instructions here\nmultiple lines\n1\n2\n3\n4\n5\n6"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticTextInstructions->Wrap( -1 );\r
+       bSizer21->Add( m_staticTextInstructions, 0, wxALL|wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer25;\r
+       bSizer25 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_buttonSubmitForm = new wxButton( m_scrolledWindow, wxID_BUTTONSAMPLE, wxT("&Submit"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer25->Add( m_buttonSubmitForm, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancelForm = new wxButton( m_scrolledWindow, wxID_CANCEL2, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer25->Add( m_buttonCancelForm, 0, wxALL, 5 );\r
+       \r
+       bSizer21->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );\r
+       \r
+       m_scrolledWindow->SetSizer( bSizer21 );\r
+       m_scrolledWindow->Layout();\r
+       bSizer21->Fit( m_scrolledWindow );\r
+       bSizer116->Add( m_scrolledWindow, 1, wxEXPAND|wxALL, 5 );\r
+       \r
+       bSizer20->Add( bSizer116, 1, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer26;\r
+       bSizer26 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_buttonBack = new wxButton( this, wxID_BUTTONBACK, wxT("< &Back  "), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonBack->Enable( false );\r
+       m_buttonBack->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer26->Add( m_buttonBack, 0, wxALL, 5 );\r
+       \r
+       m_buttonNext = new wxButton( this, wxID_BUTTONNEXT, wxT("  &Next >"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonNext->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer26->Add( m_buttonNext, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonCancel->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer26->Add( m_buttonCancel, 0, wxALL, 5 );\r
+       \r
+       bSizer20->Add( bSizer26, 0, wxALIGN_RIGHT, 5 );\r
+       \r
+       this->SetSizer( bSizer20 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_buttonSubmitForm->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonSubmitForm ), NULL, this );\r
+       m_buttonCancelForm->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonCancelForm ), NULL, this );\r
+       m_buttonBack->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonBack ), NULL, this );\r
+       m_buttonNext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonNext ), NULL, this );\r
+       m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
 CViewProductDialogBase::~CViewProductDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_buttonSubmitForm->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonSubmitForm), NULL, this);\r
-    m_buttonCancelForm->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonCancelForm), NULL, this);\r
-    m_buttonBack->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonBack), NULL, this);\r
-    m_buttonNext->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonNext), NULL, this);\r
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewProductDialogBase::OnButtonCancel), NULL, this);\r
+       // Disconnect Events\r
+       m_buttonSubmitForm->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonSubmitForm ), NULL, this );\r
+       m_buttonCancelForm->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonCancelForm ), NULL, this );\r
+       m_buttonBack->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonBack ), NULL, this );\r
+       m_buttonNext->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonNext ), NULL, this );\r
+       m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewProductDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
-CViewOrderDialogBase::CViewOrderDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style)\r
+CViewOrderDialogBase::CViewOrderDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-    this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENU));\r
-\r
-    wxBoxSizer* bSizer20;\r
-    bSizer20 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    wxBoxSizer* bSizer116;\r
-    bSizer116 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_htmlWin = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);\r
-    bSizer116->Add(m_htmlWin, 1, wxALL|wxEXPAND, 5);\r
-\r
-    bSizer20->Add(bSizer116, 1, wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer26;\r
-    bSizer26 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_buttonOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonOK->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer26->Add(m_buttonOK, 0, wxALL, 5);\r
-\r
-    bSizer20->Add(bSizer26, 0, wxALIGN_RIGHT, 5);\r
-\r
-    this->SetSizer(bSizer20);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewOrderDialogBase::OnButtonOK), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_MENU ) );\r
+       \r
+       wxBoxSizer* bSizer20;\r
+       bSizer20 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       wxBoxSizer* bSizer116;\r
+       bSizer116 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_htmlWin = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );\r
+       bSizer116->Add( m_htmlWin, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       bSizer20->Add( bSizer116, 1, wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer26;\r
+       bSizer26 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_buttonOK = new wxButton( this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonOK->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer26->Add( m_buttonOK, 0, wxALL, 5 );\r
+       \r
+       bSizer20->Add( bSizer26, 0, wxALIGN_RIGHT, 5 );\r
+       \r
+       this->SetSizer( bSizer20 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewOrderDialogBase::OnButtonOK ), NULL, this );\r
 }\r
 \r
 CViewOrderDialogBase::~CViewOrderDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CViewOrderDialogBase::OnButtonOK), NULL, this);\r
+       // Disconnect Events\r
+       m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CViewOrderDialogBase::OnButtonOK ), NULL, this );\r
 }\r
 \r
-CEditReviewDialogBase::CEditReviewDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style)\r
+CEditReviewDialogBase::CEditReviewDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-    this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENU));\r
-\r
-    wxBoxSizer* bSizer112;\r
-    bSizer112 = new wxBoxSizer(wxVERTICAL);\r
-\r
-\r
-    bSizer112->Add(0, 3, 0, 0, 5);\r
-\r
-    m_staticTextSeller = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticTextSeller->Wrap(-1);\r
-    bSizer112->Add(m_staticTextSeller, 0, wxALL|wxEXPAND, 5);\r
-\r
-\r
-    bSizer112->Add(0, 3, 0, 0, 5);\r
-\r
-    m_staticText110 = new wxStaticText(this, wxID_ANY, wxT("Rating"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText110->Wrap(-1);\r
-    bSizer112->Add(m_staticText110, 0, wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    wxString m_choiceStarsChoices[] = { wxT(" 1 star"), wxT(" 2 stars"), wxT(" 3 stars"), wxT(" 4 stars"), wxT(" 5 stars") };\r
-    int m_choiceStarsNChoices = sizeof(m_choiceStarsChoices) / sizeof(wxString);\r
-    m_choiceStars = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceStarsNChoices, m_choiceStarsChoices, 0);\r
-    m_choiceStars->SetSelection(0);\r
-    bSizer112->Add(m_choiceStars, 0, wxALL, 5);\r
-\r
-    m_staticText43 = new wxStaticText(this, wxID_ANY, wxT("Review"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticText43->Wrap(-1);\r
-    bSizer112->Add(m_staticText43, 0, wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrlReview = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);\r
-    bSizer112->Add(m_textCtrlReview, 1, wxALL|wxEXPAND, 5);\r
-\r
-    wxBoxSizer* bSizer113;\r
-    bSizer113 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_buttonSubmit = new wxButton(this, wxID_SUBMIT, wxT("&Submit"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonSubmit->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer113->Add(m_buttonSubmit, 0, wxALL, 5);\r
-\r
-    m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonCancel->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer113->Add(m_buttonCancel, 0, wxALL, 5);\r
-\r
-    bSizer112->Add(bSizer113, 0, wxALIGN_RIGHT, 5);\r
-\r
-    this->SetSizer(bSizer112);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_textCtrlReview->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditReviewDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonSubmit->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditReviewDialogBase::OnButtonSubmit), NULL, this);\r
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditReviewDialogBase::OnButtonCancel), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_MENU ) );\r
+       \r
+       wxBoxSizer* bSizer112;\r
+       bSizer112 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       \r
+       bSizer112->Add( 0, 3, 0, 0, 5 );\r
+       \r
+       m_staticTextSeller = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticTextSeller->Wrap( -1 );\r
+       bSizer112->Add( m_staticTextSeller, 0, wxALL|wxEXPAND, 5 );\r
+       \r
+       \r
+       bSizer112->Add( 0, 3, 0, 0, 5 );\r
+       \r
+       m_staticText110 = new wxStaticText( this, wxID_ANY, wxT("Rating"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText110->Wrap( -1 );\r
+       bSizer112->Add( m_staticText110, 0, wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       wxString m_choiceStarsChoices[] = { wxT(" 1 star"), wxT(" 2 stars"), wxT(" 3 stars"), wxT(" 4 stars"), wxT(" 5 stars") };\r
+       int m_choiceStarsNChoices = sizeof( m_choiceStarsChoices ) / sizeof( wxString );\r
+       m_choiceStars = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceStarsNChoices, m_choiceStarsChoices, 0 );\r
+       m_choiceStars->SetSelection( 0 );\r
+       bSizer112->Add( m_choiceStars, 0, wxALL, 5 );\r
+       \r
+       m_staticText43 = new wxStaticText( this, wxID_ANY, wxT("Review"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText43->Wrap( -1 );\r
+       bSizer112->Add( m_staticText43, 0, wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrlReview = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );\r
+       bSizer112->Add( m_textCtrlReview, 1, wxALL|wxEXPAND, 5 );\r
+       \r
+       wxBoxSizer* bSizer113;\r
+       bSizer113 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_buttonSubmit = new wxButton( this, wxID_SUBMIT, wxT("&Submit"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonSubmit->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer113->Add( m_buttonSubmit, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonCancel->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer113->Add( m_buttonCancel, 0, wxALL, 5 );\r
+       \r
+       bSizer112->Add( bSizer113, 0, wxALIGN_RIGHT, 5 );\r
+       \r
+       this->SetSizer( bSizer112 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_textCtrlReview->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditReviewDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonSubmit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditReviewDialogBase::OnButtonSubmit ), NULL, this );\r
+       m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditReviewDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
 CEditReviewDialogBase::~CEditReviewDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_textCtrlReview->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CEditReviewDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonSubmit->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditReviewDialogBase::OnButtonSubmit), NULL, this);\r
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CEditReviewDialogBase::OnButtonCancel), NULL, this);\r
+       // Disconnect Events\r
+       m_textCtrlReview->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CEditReviewDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonSubmit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditReviewDialogBase::OnButtonSubmit ), NULL, this );\r
+       m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CEditReviewDialogBase::OnButtonCancel ), NULL, this );\r
 }\r
 \r
-CPokerLobbyDialogBase::CPokerLobbyDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style)\r
+CPokerLobbyDialogBase::CPokerLobbyDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-    this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));\r
-\r
-    wxBoxSizer* bSizer156;\r
-    bSizer156 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-    m_treeCtrl = new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT|wxTR_LINES_AT_ROOT);\r
-    m_treeCtrl->SetMinSize(wxSize(130,-1));\r
-\r
-    bSizer156->Add(m_treeCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5);\r
-\r
-    wxBoxSizer* bSizer172;\r
-    bSizer172 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_listCtrl = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT);\r
-    bSizer172->Add(m_listCtrl, 1, wxEXPAND|wxALL, 5);\r
-\r
-    m_buttonNewTable = new wxButton(this, wxID_OPENNEWTABLE, wxT("&Open New Table"), wxDefaultPosition, wxDefaultSize, 0);\r
-    bSizer172->Add(m_buttonNewTable, 0, wxALL, 5);\r
-\r
-    bSizer156->Add(bSizer172, 1, wxEXPAND, 5);\r
-\r
-    this->SetSizer(bSizer156);\r
-    this->Layout();\r
-\r
-    // Connect Events\r
-    m_treeCtrl->Connect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler(CPokerLobbyDialogBase::OnTreeSelChanged), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CPokerLobbyDialogBase::OnListItemActivated), NULL, this);\r
-    m_listCtrl->Connect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(CPokerLobbyDialogBase::OnListItemSelected), NULL, this);\r
-    m_buttonNewTable->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerLobbyDialogBase::OnButtonNewTable), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );\r
+       \r
+       wxBoxSizer* bSizer156;\r
+       bSizer156 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_treeCtrl = new wxTreeCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT|wxTR_LINES_AT_ROOT );\r
+       m_treeCtrl->SetMinSize( wxSize( 130,-1 ) );\r
+       \r
+       bSizer156->Add( m_treeCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       wxBoxSizer* bSizer172;\r
+       bSizer172 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT );\r
+       bSizer172->Add( m_listCtrl, 1, wxEXPAND|wxALL, 5 );\r
+       \r
+       m_buttonNewTable = new wxButton( this, wxID_OPENNEWTABLE, wxT("&Open New Table"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer172->Add( m_buttonNewTable, 0, wxALL, 5 );\r
+       \r
+       bSizer156->Add( bSizer172, 1, wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer156 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       m_treeCtrl->Connect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( CPokerLobbyDialogBase::OnTreeSelChanged ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CPokerLobbyDialogBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( CPokerLobbyDialogBase::OnListItemSelected ), NULL, this );\r
+       m_buttonNewTable->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerLobbyDialogBase::OnButtonNewTable ), NULL, this );\r
 }\r
 \r
 CPokerLobbyDialogBase::~CPokerLobbyDialogBase()\r
 {\r
-    // Disconnect Events\r
-    m_treeCtrl->Disconnect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler(CPokerLobbyDialogBase::OnTreeSelChanged), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(CPokerLobbyDialogBase::OnListItemActivated), NULL, this);\r
-    m_listCtrl->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(CPokerLobbyDialogBase::OnListItemSelected), NULL, this);\r
-    m_buttonNewTable->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerLobbyDialogBase::OnButtonNewTable), NULL, this);\r
+       // Disconnect Events\r
+       m_treeCtrl->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( CPokerLobbyDialogBase::OnTreeSelChanged ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CPokerLobbyDialogBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( CPokerLobbyDialogBase::OnListItemSelected ), NULL, this );\r
+       m_buttonNewTable->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerLobbyDialogBase::OnButtonNewTable ), NULL, this );\r
 }\r
 \r
-CPokerDialogBase::CPokerDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style)\r
+CPokerDialogBase::CPokerDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer174;\r
-    bSizer174 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    m_checkSitOut = new wxCheckBox(this, wxID_ANY, wxT("Deal Me Out"), wxDefaultPosition, wxDefaultSize, 0);\r
-\r
-    bSizer174->Add(m_checkSitOut, 0, wxALL, 5);\r
-\r
-    m_buttonDealHand = new wxButton(this, wxID_DEALHAND, wxT("&Deal Hand"), wxDefaultPosition, wxSize(150,25), 0);\r
-    bSizer174->Add(m_buttonDealHand, 0, wxALL, 5);\r
-\r
-    m_buttonFold = new wxButton(this, wxID_FOLD, wxT("&Fold"), wxDefaultPosition, wxSize(80,25), 0);\r
-    bSizer174->Add(m_buttonFold, 0, wxALL, 5);\r
-\r
-    m_buttonCall = new wxButton(this, wxID_CALL, wxT("&Call"), wxDefaultPosition, wxSize(80,25), 0);\r
-    bSizer174->Add(m_buttonCall, 0, wxALL, 5);\r
-\r
-    m_buttonRaise = new wxButton(this, wxID_RAISE, wxT("&Raise"), wxDefaultPosition, wxSize(80,25), 0);\r
-    bSizer174->Add(m_buttonRaise, 0, wxALL, 5);\r
-\r
-    m_buttonLeaveTable = new wxButton(this, wxID_LEAVETABLE, wxT("&Leave Table"), wxDefaultPosition, wxSize(90,25), 0);\r
-    bSizer174->Add(m_buttonLeaveTable, 0, wxALL, 5);\r
-\r
-    m_textDitchPlayer = new wxTextCtrl(this, wxID_DITCHPLAYER, wxEmptyString, wxDefaultPosition, wxSize(45,-1), wxTE_PROCESS_ENTER);\r
-    bSizer174->Add(m_textDitchPlayer, 0, wxALL, 5);\r
-\r
-    m_checkPreFold = new wxCheckBox(this, wxID_ANY, wxT("FOLD"), wxDefaultPosition, wxSize(100,-1), 0);\r
-\r
-    bSizer174->Add(m_checkPreFold, 0, wxALL, 5);\r
-\r
-    m_checkPreCall = new wxCheckBox(this, wxID_ANY, wxT("CALL"), wxDefaultPosition, wxSize(100,-1), 0);\r
-\r
-    bSizer174->Add(m_checkPreCall, 0, wxALL, 5);\r
-\r
-    m_checkPreCallAny = new wxCheckBox(this, wxID_ANY, wxT("CALL ANY"), wxDefaultPosition, wxSize(100,-1), 0);\r
-\r
-    bSizer174->Add(m_checkPreCallAny, 0, wxALL, 5);\r
-\r
-    m_checkPreRaise = new wxCheckBox(this, wxID_ANY, wxT("RAISE"), wxDefaultPosition, wxSize(100,-1), 0);\r
-\r
-    bSizer174->Add(m_checkPreRaise, 0, wxALL, 5);\r
-\r
-    m_checkPreRaiseAny = new wxCheckBox(this, wxID_ANY, wxT("RAISE ANY"), wxDefaultPosition, wxSize(100,-1), 0);\r
-\r
-    bSizer174->Add(m_checkPreRaiseAny, 0, wxALL, 5);\r
-\r
-    this->SetSizer(bSizer174);\r
-    this->Layout();\r
-    m_statusBar = this->CreateStatusBar(1, wxST_SIZEGRIP, wxID_ANY);\r
-\r
-    // Connect Events\r
-    this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CPokerDialogBase::OnClose));\r
-    this->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MIDDLE_UP, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MOTION, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Connect(wxEVT_PAINT, wxPaintEventHandler(CPokerDialogBase::OnPaint));\r
-    this->Connect(wxEVT_SIZE, wxSizeEventHandler(CPokerDialogBase::OnSize));\r
-    m_checkSitOut->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckSitOut), NULL, this);\r
-    m_buttonDealHand->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonDealHand), NULL, this);\r
-    m_buttonFold->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonFold), NULL, this);\r
-    m_buttonCall->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonCall), NULL, this);\r
-    m_buttonRaise->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonRaise), NULL, this);\r
-    m_buttonLeaveTable->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonLeaveTable), NULL, this);\r
-    m_textDitchPlayer->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(CPokerDialogBase::OnDitchPlayer), NULL, this);\r
-    m_checkPreFold->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreFold), NULL, this);\r
-    m_checkPreCall->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreCall), NULL, this);\r
-    m_checkPreCallAny->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreCallAny), NULL, this);\r
-    m_checkPreRaise->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreRaise), NULL, this);\r
-    m_checkPreRaiseAny->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreRaiseAny), NULL, this);\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer174;\r
+       bSizer174 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_checkSitOut = new wxCheckBox( this, wxID_ANY, wxT("Deal Me Out"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       \r
+       bSizer174->Add( m_checkSitOut, 0, wxALL, 5 );\r
+       \r
+       m_buttonDealHand = new wxButton( this, wxID_DEALHAND, wxT("&Deal Hand"), wxDefaultPosition, wxSize( 150,25 ), 0 );\r
+       bSizer174->Add( m_buttonDealHand, 0, wxALL, 5 );\r
+       \r
+       m_buttonFold = new wxButton( this, wxID_FOLD, wxT("&Fold"), wxDefaultPosition, wxSize( 80,25 ), 0 );\r
+       bSizer174->Add( m_buttonFold, 0, wxALL, 5 );\r
+       \r
+       m_buttonCall = new wxButton( this, wxID_CALL, wxT("&Call"), wxDefaultPosition, wxSize( 80,25 ), 0 );\r
+       bSizer174->Add( m_buttonCall, 0, wxALL, 5 );\r
+       \r
+       m_buttonRaise = new wxButton( this, wxID_RAISE, wxT("&Raise"), wxDefaultPosition, wxSize( 80,25 ), 0 );\r
+       bSizer174->Add( m_buttonRaise, 0, wxALL, 5 );\r
+       \r
+       m_buttonLeaveTable = new wxButton( this, wxID_LEAVETABLE, wxT("&Leave Table"), wxDefaultPosition, wxSize( 90,25 ), 0 );\r
+       bSizer174->Add( m_buttonLeaveTable, 0, wxALL, 5 );\r
+       \r
+       m_textDitchPlayer = new wxTextCtrl( this, wxID_DITCHPLAYER, wxEmptyString, wxDefaultPosition, wxSize( 45,-1 ), wxTE_PROCESS_ENTER );\r
+       bSizer174->Add( m_textDitchPlayer, 0, wxALL, 5 );\r
+       \r
+       m_checkPreFold = new wxCheckBox( this, wxID_ANY, wxT("FOLD"), wxDefaultPosition, wxSize( 100,-1 ), 0 );\r
+       \r
+       bSizer174->Add( m_checkPreFold, 0, wxALL, 5 );\r
+       \r
+       m_checkPreCall = new wxCheckBox( this, wxID_ANY, wxT("CALL"), wxDefaultPosition, wxSize( 100,-1 ), 0 );\r
+       \r
+       bSizer174->Add( m_checkPreCall, 0, wxALL, 5 );\r
+       \r
+       m_checkPreCallAny = new wxCheckBox( this, wxID_ANY, wxT("CALL ANY"), wxDefaultPosition, wxSize( 100,-1 ), 0 );\r
+       \r
+       bSizer174->Add( m_checkPreCallAny, 0, wxALL, 5 );\r
+       \r
+       m_checkPreRaise = new wxCheckBox( this, wxID_ANY, wxT("RAISE"), wxDefaultPosition, wxSize( 100,-1 ), 0 );\r
+       \r
+       bSizer174->Add( m_checkPreRaise, 0, wxALL, 5 );\r
+       \r
+       m_checkPreRaiseAny = new wxCheckBox( this, wxID_ANY, wxT("RAISE ANY"), wxDefaultPosition, wxSize( 100,-1 ), 0 );\r
+       \r
+       bSizer174->Add( m_checkPreRaiseAny, 0, wxALL, 5 );\r
+       \r
+       this->SetSizer( bSizer174 );\r
+       this->Layout();\r
+       m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );\r
+       \r
+       // Connect Events\r
+       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CPokerDialogBase::OnClose ) );\r
+       this->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MOTION, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MIDDLE_DCLICK, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Connect( wxEVT_PAINT, wxPaintEventHandler( CPokerDialogBase::OnPaint ) );\r
+       this->Connect( wxEVT_SIZE, wxSizeEventHandler( CPokerDialogBase::OnSize ) );\r
+       m_checkSitOut->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckSitOut ), NULL, this );\r
+       m_buttonDealHand->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonDealHand ), NULL, this );\r
+       m_buttonFold->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonFold ), NULL, this );\r
+       m_buttonCall->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonCall ), NULL, this );\r
+       m_buttonRaise->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonRaise ), NULL, this );\r
+       m_buttonLeaveTable->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonLeaveTable ), NULL, this );\r
+       m_textDitchPlayer->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( CPokerDialogBase::OnDitchPlayer ), NULL, this );\r
+       m_checkPreFold->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreFold ), NULL, this );\r
+       m_checkPreCall->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreCall ), NULL, this );\r
+       m_checkPreCallAny->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreCallAny ), NULL, this );\r
+       m_checkPreRaise->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreRaise ), NULL, this );\r
+       m_checkPreRaiseAny->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreRaiseAny ), NULL, this );\r
 }\r
 \r
 CPokerDialogBase::~CPokerDialogBase()\r
 {\r
-    // Disconnect Events\r
-    this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CPokerDialogBase::OnClose));\r
-    this->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MIDDLE_UP, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_RIGHT_UP, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MOTION, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(CPokerDialogBase::OnMouseEvents));\r
-    this->Disconnect(wxEVT_PAINT, wxPaintEventHandler(CPokerDialogBase::OnPaint));\r
-    this->Disconnect(wxEVT_SIZE, wxSizeEventHandler(CPokerDialogBase::OnSize));\r
-    m_checkSitOut->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckSitOut), NULL, this);\r
-    m_buttonDealHand->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonDealHand), NULL, this);\r
-    m_buttonFold->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonFold), NULL, this);\r
-    m_buttonCall->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonCall), NULL, this);\r
-    m_buttonRaise->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonRaise), NULL, this);\r
-    m_buttonLeaveTable->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnButtonLeaveTable), NULL, this);\r
-    m_textDitchPlayer->Disconnect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(CPokerDialogBase::OnDitchPlayer), NULL, this);\r
-    m_checkPreFold->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreFold), NULL, this);\r
-    m_checkPreCall->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreCall), NULL, this);\r
-    m_checkPreCallAny->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreCallAny), NULL, this);\r
-    m_checkPreRaise->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreRaise), NULL, this);\r
-    m_checkPreRaiseAny->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(CPokerDialogBase::OnCheckPreRaiseAny), NULL, this);\r
+       // Disconnect Events\r
+       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CPokerDialogBase::OnClose ) );\r
+       this->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MOTION, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MIDDLE_DCLICK, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CPokerDialogBase::OnMouseEvents ) );\r
+       this->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CPokerDialogBase::OnPaint ) );\r
+       this->Disconnect( wxEVT_SIZE, wxSizeEventHandler( CPokerDialogBase::OnSize ) );\r
+       m_checkSitOut->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckSitOut ), NULL, this );\r
+       m_buttonDealHand->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonDealHand ), NULL, this );\r
+       m_buttonFold->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonFold ), NULL, this );\r
+       m_buttonCall->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonCall ), NULL, this );\r
+       m_buttonRaise->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonRaise ), NULL, this );\r
+       m_buttonLeaveTable->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnButtonLeaveTable ), NULL, this );\r
+       m_textDitchPlayer->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( CPokerDialogBase::OnDitchPlayer ), NULL, this );\r
+       m_checkPreFold->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreFold ), NULL, this );\r
+       m_checkPreCall->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreCall ), NULL, this );\r
+       m_checkPreCallAny->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreCallAny ), NULL, this );\r
+       m_checkPreRaise->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreRaise ), NULL, this );\r
+       m_checkPreRaiseAny->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CPokerDialogBase::OnCheckPreRaiseAny ), NULL, this );\r
 }\r
 \r
-CGetTextFromUserDialogBase::CGetTextFromUserDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style)\r
+CGetTextFromUserDialogBase::CGetTextFromUserDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r
 {\r
-    this->SetSizeHints(wxDefaultSize, wxDefaultSize);\r
-\r
-    wxBoxSizer* bSizer79;\r
-    bSizer79 = new wxBoxSizer(wxVERTICAL);\r
-\r
-    wxBoxSizer* bSizer81;\r
-    bSizer81 = new wxBoxSizer(wxVERTICAL);\r
-\r
-\r
-    bSizer81->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    m_staticTextMessage1 = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticTextMessage1->Wrap(-1);\r
-    bSizer81->Add(m_staticTextMessage1, 0, wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrl1 = new wxTextCtrl(this, wxID_TEXTCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);\r
-    bSizer81->Add(m_textCtrl1, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5);\r
-\r
-    m_staticTextMessage2 = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);\r
-    m_staticTextMessage2->Wrap(-1);\r
-    m_staticTextMessage2->Hide();\r
-\r
-    bSizer81->Add(m_staticTextMessage2, 0, wxTOP|wxRIGHT|wxLEFT, 5);\r
-\r
-    m_textCtrl2 = new wxTextCtrl(this, wxID_TEXTCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);\r
-    m_textCtrl2->Hide();\r
-\r
-    bSizer81->Add(m_textCtrl2, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5);\r
-\r
-\r
-    bSizer81->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    bSizer79->Add(bSizer81, 1, wxEXPAND|wxALL, 10);\r
-\r
-    wxBoxSizer* bSizer80;\r
-    bSizer80 = new wxBoxSizer(wxHORIZONTAL);\r
-\r
-\r
-    bSizer80->Add(0, 0, 1, wxEXPAND, 5);\r
-\r
-    m_buttonOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize(-1,-1), 0);\r
-    m_buttonOK->SetMinSize(wxSize(85,25));\r
-\r
-    bSizer80->Add(m_buttonOK, 0, wxALL, 5);\r
-\r
-    m_buttonCancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0);\r
-    m_buttonCancel->SetMinSize(wxSize(85,25));\r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+       \r
+       wxBoxSizer* bSizer79;\r
+       bSizer79 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       wxBoxSizer* bSizer81;\r
+       bSizer81 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       \r
+       bSizer81->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       m_staticTextMessage1 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticTextMessage1->Wrap( -1 );\r
+       bSizer81->Add( m_staticTextMessage1, 0, wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrl1 = new wxTextCtrl( this, wxID_TEXTCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );\r
+       bSizer81->Add( m_textCtrl1, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );\r
+       \r
+       m_staticTextMessage2 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticTextMessage2->Wrap( -1 );\r
+       m_staticTextMessage2->Hide();\r
+       \r
+       bSizer81->Add( m_staticTextMessage2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );\r
+       \r
+       m_textCtrl2 = new wxTextCtrl( this, wxID_TEXTCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );\r
+       m_textCtrl2->Hide();\r
+       \r
+       bSizer81->Add( m_textCtrl2, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );\r
+       \r
+       \r
+       bSizer81->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       bSizer79->Add( bSizer81, 1, wxEXPAND|wxALL, 10 );\r
+       \r
+       wxBoxSizer* bSizer80;\r
+       bSizer80 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       \r
+       bSizer80->Add( 0, 0, 1, wxEXPAND, 5 );\r
+       \r
+       m_buttonOK = new wxButton( this, wxID_OK, wxT("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );\r
+       m_buttonOK->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer80->Add( m_buttonOK, 0, wxALL, 5 );\r
+       \r
+       m_buttonCancel = new wxButton( this, wxID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_buttonCancel->SetMinSize( wxSize( 85,25 ) );\r
+       \r
+       bSizer80->Add( m_buttonCancel, 0, wxALL, 5 );\r
+       \r
+       bSizer79->Add( bSizer80, 0, wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer79 );\r
+       this->Layout();\r
+       \r
+       // Connect Events\r
+       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CGetTextFromUserDialogBase::OnClose ) );\r
+       m_textCtrl1->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CGetTextFromUserDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrl2->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( CGetTextFromUserDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CGetTextFromUserDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CGetTextFromUserDialogBase::OnButtonCancel ), NULL, this );\r
+}\r
 \r
-    bSizer80->Add(m_buttonCancel, 0, wxALL, 5);\r
+CGetTextFromUserDialogBase::~CGetTextFromUserDialogBase()\r
+{\r
+       // Disconnect Events\r
+       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CGetTextFromUserDialogBase::OnClose ) );\r
+       m_textCtrl1->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CGetTextFromUserDialogBase::OnKeyDown ), NULL, this );\r
+       m_textCtrl2->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( CGetTextFromUserDialogBase::OnKeyDown ), NULL, this );\r
+       m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CGetTextFromUserDialogBase::OnButtonOK ), NULL, this );\r
+       m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CGetTextFromUserDialogBase::OnButtonCancel ), NULL, this );\r
+}\r
 \r
-    bSizer79->Add(bSizer80, 0, wxEXPAND, 5);\r
+COptionsPanelBitcoinBase::COptionsPanelBitcoinBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )\r
+{\r
+       wxBoxSizer* bSizer62;\r
+       bSizer62 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       \r
+       bSizer62->Add( 0, 20, 0, wxEXPAND, 5 );\r
+       \r
+       m_staticText32 = new wxStaticText( this, wxID_ANY, wxT("Optional transaction fee you give to the nodes that process your transactions."), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText32->Wrap( -1 );\r
+       bSizer62->Add( m_staticText32, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
+       \r
+       wxBoxSizer* bSizer56;\r
+       bSizer56 = new wxBoxSizer( wxHORIZONTAL );\r
+       \r
+       m_staticText31 = new wxStaticText( this, wxID_ANY, wxT("Transaction fee:"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_staticText31->Wrap( -1 );\r
+       bSizer56->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );\r
+       \r
+       m_textCtrlTransactionFee = new wxTextCtrl( this, wxID_TRANSACTIONFEE, wxEmptyString, wxDefaultPosition, wxSize( 70,-1 ), 0 );\r
+       bSizer56->Add( m_textCtrlTransactionFee, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );\r
+       \r
+       bSizer62->Add( bSizer56, 0, wxEXPAND, 5 );\r
+       \r
+       this->SetSizer( bSizer62 );\r
+       this->Layout();\r
+       bSizer62->Fit( this );\r
+       \r
+       // Connect Events\r
+       m_textCtrlTransactionFee->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( COptionsPanelBitcoinBase::OnKillFocusTransactionFee ), NULL, this );\r
+}\r
 \r
-    this->SetSizer(bSizer79);\r
-    this->Layout();\r
+COptionsPanelBitcoinBase::~COptionsPanelBitcoinBase()\r
+{\r
+       // Disconnect Events\r
+       m_textCtrlTransactionFee->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( COptionsPanelBitcoinBase::OnKillFocusTransactionFee ), NULL, this );\r
+}\r
 \r
-    // Connect Events\r
-    this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CGetTextFromUserDialogBase::OnClose));\r
-    m_textCtrl1->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CGetTextFromUserDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrl2->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CGetTextFromUserDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonOK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CGetTextFromUserDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CGetTextFromUserDialogBase::OnButtonCancel), NULL, this);\r
+COptionsPanelUIBase::COptionsPanelUIBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )\r
+{\r
+       wxBoxSizer* bSizer57;\r
+       bSizer57 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       \r
+       bSizer57->Add( 0, 20, 1, wxEXPAND, 5 );\r
+       \r
+       m_checkMinToTray = new wxCheckBox( this, wxID_MINTOTRAY, wxT("Minimize to tray"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       \r
+       bSizer57->Add( m_checkMinToTray, 0, wxALL, 5 );\r
+       \r
+       m_checkCloseToTray = new wxCheckBox( this, wxID_ANY, wxT("Close to tray"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       \r
+       bSizer57->Add( m_checkCloseToTray, 0, wxALL, 5 );\r
+       \r
+       m_checkStartOnSysBoot = new wxCheckBox( this, wxID_ANY, wxT("Start on system boot"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       \r
+       bSizer57->Add( m_checkStartOnSysBoot, 0, wxALL, 5 );\r
+       \r
+       m_checkAskBeforeClosing = new wxCheckBox( this, wxID_ANY, wxT("Ask before closing"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       \r
+       bSizer57->Add( m_checkAskBeforeClosing, 0, wxALL, 5 );\r
+       \r
+       m_checkAlwaysShowTray = new wxCheckBox( this, wxID_ANY, wxT("Always show tray icon"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       \r
+       bSizer57->Add( m_checkAlwaysShowTray, 0, wxALL, 5 );\r
+       \r
+       this->SetSizer( bSizer57 );\r
+       this->Layout();\r
+       bSizer57->Fit( this );\r
 }\r
 \r
-CGetTextFromUserDialogBase::~CGetTextFromUserDialogBase()\r
+COptionsPanelUIBase::~COptionsPanelUIBase()\r
 {\r
-    // Disconnect Events\r
-    this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CGetTextFromUserDialogBase::OnClose));\r
-    m_textCtrl1->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CGetTextFromUserDialogBase::OnKeyDown), NULL, this);\r
-    m_textCtrl2->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(CGetTextFromUserDialogBase::OnKeyDown), NULL, this);\r
-    m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CGetTextFromUserDialogBase::OnButtonOK), NULL, this);\r
-    m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CGetTextFromUserDialogBase::OnButtonCancel), NULL, this);\r
 }\r

diff --git a/uibase.h b/uibase.h
index bfcd8ec..61e0552 100644 (file)
--- a/uibase.h
+++ b/uibase.h
@@ -1,7 +1,3 @@
-// Copyright (c) 2009 Satoshi Nakamoto\r
-// Distributed under the MIT/X11 software license, see the accompanying\r
-// file license.txt or http://www.opensource.org/licenses/mit-license.php.\r
-\r
 ///////////////////////////////////////////////////////////////////////////\r
 // C++ code generated with wxFormBuilder (version Apr 16 2008)\r
 // http://www.wxformbuilder.org/\r
@@ -34,11 +30,12 @@
 #include <wx/frame.h>\r
 #include <wx/html/htmlwin.h>\r
 #include <wx/dialog.h>\r
+#include <wx/treectrl.h>\r
+#include <wx/statline.h>\r
 #include <wx/statbmp.h>\r
 #include <wx/combobox.h>\r
 #include <wx/scrolwin.h>\r
 #include <wx/richtext/richtextctrl.h>\r
-#include <wx/treectrl.h>\r
 #include <wx/checkbox.h>\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -50,674 +47,721 @@
 #define wxID_TEXTCTRLADDRESS 1004\r
 #define wxID_BUTTONCOPY 1005\r
 #define wxID_BUTTONCHANGE 1006\r
-#define wxID_TRANSACTIONFEE 1007\r
-#define wxID_TEXTCTRLPAYTO 1008\r
-#define wxID_BUTTONPASTE 1009\r
-#define wxID_BUTTONADDRESSBOOK 1010\r
-#define wxID_TEXTCTRLAMOUNT 1011\r
-#define wxID_CHOICETRANSFERTYPE 1012\r
-#define wxID_LISTCTRL 1013\r
-#define wxID_BUTTONRENAME 1014\r
-#define wxID_BUTTONNEW 1015\r
-#define wxID_BUTTONEDIT 1016\r
-#define wxID_BUTTONDELETE 1017\r
-#define wxID_DEL0 1018\r
-#define wxID_DEL1 1019\r
-#define wxID_DEL2 1020\r
-#define wxID_DEL3 1021\r
-#define wxID_DEL4 1022\r
-#define wxID_DEL5 1023\r
-#define wxID_DEL6 1024\r
-#define wxID_DEL7 1025\r
-#define wxID_DEL8 1026\r
-#define wxID_DEL9 1027\r
-#define wxID_DEL10 1028\r
-#define wxID_DEL11 1029\r
-#define wxID_DEL12 1030\r
-#define wxID_DEL13 1031\r
-#define wxID_DEL14 1032\r
-#define wxID_DEL15 1033\r
-#define wxID_DEL16 1034\r
-#define wxID_DEL17 1035\r
-#define wxID_DEL18 1036\r
-#define wxID_DEL19 1037\r
-#define wxID_BUTTONPREVIEW 1038\r
-#define wxID_BUTTONSAMPLE 1039\r
-#define wxID_CANCEL2 1040\r
-#define wxID_BUTTONBACK 1041\r
-#define wxID_BUTTONNEXT 1042\r
-#define wxID_SUBMIT 1043\r
-#define wxID_OPENNEWTABLE 1044\r
-#define wxID_DEALHAND 1045\r
-#define wxID_FOLD 1046\r
-#define wxID_CALL 1047\r
-#define wxID_RAISE 1048\r
-#define wxID_LEAVETABLE 1049\r
-#define wxID_DITCHPLAYER 1050\r
-#define wxID_TEXTCTRL 1051\r
+#define wxID_TEXTCTRLPAYTO 1007\r
+#define wxID_BUTTONPASTE 1008\r
+#define wxID_BUTTONADDRESSBOOK 1009\r
+#define wxID_TEXTCTRLAMOUNT 1010\r
+#define wxID_CHOICETRANSFERTYPE 1011\r
+#define wxID_LISTCTRL 1012\r
+#define wxID_BUTTONRENAME 1013\r
+#define wxID_BUTTONNEW 1014\r
+#define wxID_BUTTONEDIT 1015\r
+#define wxID_BUTTONDELETE 1016\r
+#define wxID_DEL0 1017\r
+#define wxID_DEL1 1018\r
+#define wxID_DEL2 1019\r
+#define wxID_DEL3 1020\r
+#define wxID_DEL4 1021\r
+#define wxID_DEL5 1022\r
+#define wxID_DEL6 1023\r
+#define wxID_DEL7 1024\r
+#define wxID_DEL8 1025\r
+#define wxID_DEL9 1026\r
+#define wxID_DEL10 1027\r
+#define wxID_DEL11 1028\r
+#define wxID_DEL12 1029\r
+#define wxID_DEL13 1030\r
+#define wxID_DEL14 1031\r
+#define wxID_DEL15 1032\r
+#define wxID_DEL16 1033\r
+#define wxID_DEL17 1034\r
+#define wxID_DEL18 1035\r
+#define wxID_DEL19 1036\r
+#define wxID_BUTTONPREVIEW 1037\r
+#define wxID_BUTTONSAMPLE 1038\r
+#define wxID_CANCEL2 1039\r
+#define wxID_BUTTONBACK 1040\r
+#define wxID_BUTTONNEXT 1041\r
+#define wxID_SUBMIT 1042\r
+#define wxID_OPENNEWTABLE 1043\r
+#define wxID_DEALHAND 1044\r
+#define wxID_FOLD 1045\r
+#define wxID_CALL 1046\r
+#define wxID_RAISE 1047\r
+#define wxID_LEAVETABLE 1048\r
+#define wxID_DITCHPLAYER 1049\r
+#define wxID_TEXTCTRL 1050\r
+#define wxID_TRANSACTIONFEE 1051\r
+#define wxID_MINTOTRAY 1052\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CMainFrameBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CMainFrameBase : public wxFrame\r
+class CMainFrameBase : public wxFrame \r
 {\r
-private:\r
-\r
-protected:\r
-    wxMenuBar* m_menubar;\r
-    wxMenu* m_menuFile;\r
-    wxMenu* m_menuHelp;\r
-    wxToolBar* m_toolBar;\r
-    wxStatusBar* m_statusBar;\r
-\r
-    wxStaticText* m_staticText32;\r
-    wxTextCtrl* m_textCtrlAddress;\r
-    wxButton* m_buttonCopy;\r
-    wxButton* m_button91;\r
-\r
-    wxPanel* m_panel14;\r
-    wxStaticText* m_staticText41;\r
-    wxStaticText* m_staticTextBalance;\r
-\r
-    wxChoice* m_choiceFilter;\r
-    wxNotebook* m_notebook;\r
-    wxPanel* m_panel7;\r
-    wxPanel* m_panel9;\r
-    wxPanel* m_panel8;\r
-    wxPanel* m_panel10;\r
-    wxPanel* m_panel11;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }\r
-    virtual void OnIdle(wxIdleEvent& event){ event.Skip(); }\r
-    virtual void OnMouseEvents(wxMouseEvent& event){ event.Skip(); }\r
-    virtual void OnPaint(wxPaintEvent& event){ event.Skip(); }\r
-    virtual void OnMenuFileExit(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnMenuOptionsGenerate(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnMenuOptionsChangeYourAddress(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnMenuOptionsOptions(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnMenuHelpAbout(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonSend(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonAddressBook(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }\r
-    virtual void OnMouseEventsAddress(wxMouseEvent& event){ event.Skip(); }\r
-    virtual void OnSetFocusAddress(wxFocusEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCopy(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonChange(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnListColBeginDrag(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnListItemActivatedAllTransactions(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnPaintListCtrl(wxPaintEvent& event){ event.Skip(); }\r
-    virtual void OnListItemActivatedOrdersSent(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnListItemActivatedProductsSent(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnListItemActivatedOrdersReceived(wxListEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    wxMenu* m_menuOptions;\r
-    wxListCtrl* m_listCtrl;\r
-    wxListCtrl* m_listCtrlEscrows;\r
-    wxListCtrl* m_listCtrlOrdersSent;\r
-    wxListCtrl* m_listCtrlProductsSent;\r
-    wxListCtrl* m_listCtrlOrdersReceived;\r
-    CMainFrameBase(wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = wxT("Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(705,484), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);\r
-    ~CMainFrameBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxMenuBar* m_menubar;\r
+               wxMenu* m_menuFile;\r
+               wxMenu* m_menuHelp;\r
+               wxToolBar* m_toolBar;\r
+               wxStatusBar* m_statusBar;\r
+               \r
+               wxStaticText* m_staticText32;\r
+               wxTextCtrl* m_textCtrlAddress;\r
+               wxButton* m_buttonCopy;\r
+               wxButton* m_button91;\r
+               \r
+               wxPanel* m_panel14;\r
+               wxStaticText* m_staticText41;\r
+               wxStaticText* m_staticTextBalance;\r
+               \r
+               wxChoice* m_choiceFilter;\r
+               wxNotebook* m_notebook;\r
+               wxPanel* m_panel7;\r
+               wxPanel* m_panel9;\r
+               wxPanel* m_panel8;\r
+               wxPanel* m_panel10;\r
+               wxPanel* m_panel11;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }\r
+               virtual void OnIconize( wxIconizeEvent& event ){ event.Skip(); }\r
+               virtual void OnIdle( wxIdleEvent& event ){ event.Skip(); }\r
+               virtual void OnMouseEvents( wxMouseEvent& event ){ event.Skip(); }\r
+               virtual void OnPaint( wxPaintEvent& event ){ event.Skip(); }\r
+               virtual void OnMenuFileExit( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnMenuOptionsGenerate( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnUpdateMenuGenerate( wxUpdateUIEvent& event ){ event.Skip(); }\r
+               virtual void OnMenuOptionsChangeYourAddress( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnMenuOptionsOptions( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnMenuHelpAbout( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonSend( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonAddressBook( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }\r
+               virtual void OnMouseEventsAddress( wxMouseEvent& event ){ event.Skip(); }\r
+               virtual void OnSetFocusAddress( wxFocusEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCopy( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonChange( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnListColBeginDrag( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemActivatedAllTransactions( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnPaintListCtrl( wxPaintEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemActivatedOrdersSent( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemActivatedProductsSent( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemActivatedOrdersReceived( wxListEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               wxMenu* m_menuOptions;\r
+               wxListCtrl* m_listCtrl;\r
+               wxListCtrl* m_listCtrlEscrows;\r
+               wxListCtrl* m_listCtrlOrdersSent;\r
+               wxListCtrl* m_listCtrlProductsSent;\r
+               wxListCtrl* m_listCtrlOrdersReceived;\r
+               CMainFrameBase( wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = wxT("Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 705,484 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+               ~CMainFrameBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CTxDetailsDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CTxDetailsDialogBase : public wxDialog\r
+class CTxDetailsDialogBase : public wxDialog \r
 {\r
-private:\r
-\r
-protected:\r
-    wxHtmlWindow* m_htmlWin;\r
-    wxButton* m_buttonOK;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    CTxDetailsDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Transaction Details"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(620,450), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);\r
-    ~CTxDetailsDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxHtmlWindow* m_htmlWin;\r
+               wxButton* m_buttonOK;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CTxDetailsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Transaction Details"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 620,450 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );\r
+               ~CTxDetailsDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class COptionsDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class COptionsDialogBase : public wxDialog\r
+class COptionsDialogBase : public wxDialog \r
 {\r
-private:\r
-\r
-protected:\r
-\r
-    wxStaticText* m_staticText32;\r
-    wxStaticText* m_staticText31;\r
-    wxTextCtrl* m_textCtrlTransactionFee;\r
-    wxButton* m_buttonOK;\r
-    wxButton* m_buttonCancel;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnKillFocusTransactionFee(wxFocusEvent& event){ event.Skip(); }\r
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    COptionsDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(500,261), long style = wxDEFAULT_DIALOG_STYLE);\r
-    ~COptionsDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxBoxSizer* panelSizer;\r
+               wxTreeCtrl* m_treeCtrl;\r
+               wxStaticLine* m_staticline1;\r
+               wxButton* m_buttonOK;\r
+               wxButton* m_buttonCancel;\r
+               wxButton* m_buttonApply;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void MenuSelChanged( wxTreeEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               COptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 555,377 ), long style = wxDEFAULT_DIALOG_STYLE );\r
+               ~COptionsDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CAboutDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CAboutDialogBase : public wxDialog\r
+class CAboutDialogBase : public wxDialog \r
 {\r
-private:\r
-\r
-protected:\r
-\r
-\r
-    wxStaticText* m_staticText40;\r
-\r
-    wxStaticText* m_staticTextMain;\r
-\r
-\r
-    wxButton* m_buttonOK;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    wxStaticText* m_staticTextVersion;\r
-    CAboutDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(507,298), long style = wxDEFAULT_DIALOG_STYLE);\r
-    ~CAboutDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               \r
+               \r
+               wxStaticText* m_staticText40;\r
+               \r
+               wxStaticText* m_staticTextMain;\r
+               \r
+               \r
+               wxButton* m_buttonOK;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               wxStaticText* m_staticTextVersion;\r
+               CAboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 507,298 ), long style = wxDEFAULT_DIALOG_STYLE );\r
+               ~CAboutDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CSendDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CSendDialogBase : public wxDialog\r
+class CSendDialogBase : public wxDialog \r
 {\r
-private:\r
-\r
-protected:\r
-\r
-\r
-    wxStaticText* m_staticText14;\r
-\r
-    wxStaticBitmap* m_bitmapCheckMark;\r
-    wxStaticText* m_staticText36;\r
-    wxTextCtrl* m_textCtrlAddress;\r
-    wxButton* m_buttonPaste;\r
-    wxButton* m_buttonAddress;\r
-    wxStaticText* m_staticText19;\r
-    wxTextCtrl* m_textCtrlAmount;\r
-    wxStaticText* m_staticText20;\r
-    wxChoice* m_choiceTransferType;\r
-\r
-\r
-    wxStaticText* m_staticTextFrom;\r
-    wxTextCtrl* m_textCtrlFrom;\r
-    wxStaticText* m_staticTextMessage;\r
-    wxTextCtrl* m_textCtrlMessage;\r
-\r
-    wxButton* m_buttonSend;\r
-    wxButton* m_buttonCancel;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }\r
-    virtual void OnTextAddress(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonPaste(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonAddressBook(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnKillFocusAmount(wxFocusEvent& event){ event.Skip(); }\r
-    virtual void OnButtonSend(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    CSendDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Send Coins"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(675,312), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);\r
-    ~CSendDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               \r
+               \r
+               wxStaticText* m_staticText14;\r
+               \r
+               wxStaticBitmap* m_bitmapCheckMark;\r
+               wxStaticText* m_staticText36;\r
+               wxTextCtrl* m_textCtrlAddress;\r
+               wxButton* m_buttonPaste;\r
+               wxButton* m_buttonAddress;\r
+               wxStaticText* m_staticText19;\r
+               wxTextCtrl* m_textCtrlAmount;\r
+               wxStaticText* m_staticText20;\r
+               wxChoice* m_choiceTransferType;\r
+               \r
+               \r
+               wxStaticText* m_staticTextFrom;\r
+               wxTextCtrl* m_textCtrlFrom;\r
+               wxStaticText* m_staticTextMessage;\r
+               wxTextCtrl* m_textCtrlMessage;\r
+               \r
+               wxButton* m_buttonSend;\r
+               wxButton* m_buttonCancel;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }\r
+               virtual void OnTextAddress( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonPaste( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonAddressBook( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnKillFocusAmount( wxFocusEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonSend( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CSendDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Send Coins"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 675,312 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );\r
+               ~CSendDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CSendingDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CSendingDialogBase : public wxDialog\r
+class CSendingDialogBase : public wxDialog \r
 {\r
-private:\r
-\r
-protected:\r
-    wxStaticText* m_staticTextSending;\r
-    wxTextCtrl* m_textCtrlStatus;\r
-\r
-    wxButton* m_buttonOK;\r
-    wxButton* m_buttonCancel;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }\r
-    virtual void OnPaint(wxPaintEvent& event){ event.Skip(); }\r
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    CSendingDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Sending..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(442,151), long style = wxDEFAULT_DIALOG_STYLE);\r
-    ~CSendingDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxStaticText* m_staticTextSending;\r
+               wxTextCtrl* m_textCtrlStatus;\r
+               \r
+               wxButton* m_buttonOK;\r
+               wxButton* m_buttonCancel;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }\r
+               virtual void OnPaint( wxPaintEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CSendingDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Sending..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 442,151 ), long style = wxDEFAULT_DIALOG_STYLE );\r
+               ~CSendingDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CYourAddressDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CYourAddressDialogBase : public wxDialog\r
+class CYourAddressDialogBase : public wxDialog \r
 {\r
-private:\r
-\r
-protected:\r
-\r
-    wxStaticText* m_staticText45;\r
-    wxListCtrl* m_listCtrl;\r
-\r
-    wxButton* m_buttonRename;\r
-    wxButton* m_buttonNew;\r
-    wxButton* m_buttonCopy;\r
-    wxButton* m_buttonOK;\r
-    wxButton* m_buttonCancel;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }\r
-    virtual void OnListEndLabelEdit(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnListItemActivated(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnListItemSelected(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnButtonRename(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonNew(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCopy(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    CYourAddressDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Your Bitcoin Addresses"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(610,390), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);\r
-    ~CYourAddressDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               \r
+               wxStaticText* m_staticText45;\r
+               wxListCtrl* m_listCtrl;\r
+               \r
+               wxButton* m_buttonRename;\r
+               wxButton* m_buttonNew;\r
+               wxButton* m_buttonCopy;\r
+               wxButton* m_buttonOK;\r
+               wxButton* m_buttonCancel;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }\r
+               virtual void OnListEndLabelEdit( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonRename( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonNew( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCopy( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CYourAddressDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Your Bitcoin Addresses"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,390 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );\r
+               ~CYourAddressDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CAddressBookDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CAddressBookDialogBase : public wxDialog\r
+class CAddressBookDialogBase : public wxDialog \r
 {\r
-private:\r
-\r
-protected:\r
-\r
-    wxStaticText* m_staticText55;\r
-    wxListCtrl* m_listCtrl;\r
-\r
-    wxButton* m_buttonEdit;\r
-    wxButton* m_buttonNew;\r
-    wxButton* m_buttonDelete;\r
-    wxButton* m_buttonOK;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }\r
-    virtual void OnListEndLabelEdit(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnListItemActivated(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnListItemSelected(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnButtonEdit(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonNew(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDelete(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    wxButton* m_buttonCancel;\r
-    CAddressBookDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Address Book"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(610,390), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);\r
-    ~CAddressBookDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               \r
+               wxStaticText* m_staticText55;\r
+               wxListCtrl* m_listCtrl;\r
+               \r
+               wxButton* m_buttonEdit;\r
+               wxButton* m_buttonNew;\r
+               wxButton* m_buttonDelete;\r
+               wxButton* m_buttonOK;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }\r
+               virtual void OnListEndLabelEdit( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonEdit( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonNew( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDelete( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               wxButton* m_buttonCancel;\r
+               CAddressBookDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Address Book"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,390 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );\r
+               ~CAddressBookDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CProductsDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CProductsDialogBase : public wxDialog\r
+class CProductsDialogBase : public wxDialog \r
 {\r
-private:\r
-\r
-protected:\r
-    wxComboBox* m_comboBoxCategory;\r
-    wxTextCtrl* m_textCtrlSearch;\r
-    wxButton* m_buttonSearch;\r
-    wxListCtrl* m_listCtrl;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnCombobox(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }\r
-    virtual void OnButtonSearch(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnListItemActivated(wxListEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    CProductsDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Marketplace"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(708,535), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);\r
-    ~CProductsDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxComboBox* m_comboBoxCategory;\r
+               wxTextCtrl* m_textCtrlSearch;\r
+               wxButton* m_buttonSearch;\r
+               wxListCtrl* m_listCtrl;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnCombobox( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonSearch( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CProductsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Marketplace"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 708,535 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );\r
+               ~CProductsDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CEditProductDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CEditProductDialogBase : public wxFrame\r
+class CEditProductDialogBase : public wxFrame \r
 {\r
-private:\r
-\r
-protected:\r
-    wxScrolledWindow* m_scrolledWindow;\r
-    wxStaticText* m_staticText106;\r
-    wxComboBox* m_comboBoxCategory;\r
-    wxStaticText* m_staticText108;\r
-    wxTextCtrl* m_textCtrlTitle;\r
-    wxStaticText* m_staticText107;\r
-    wxTextCtrl* m_textCtrlPrice;\r
-    wxStaticText* m_staticText22;\r
-    wxTextCtrl* m_textCtrlDescription;\r
-    wxStaticText* m_staticText23;\r
-    wxTextCtrl* m_textCtrlInstructions;\r
-    wxStaticText* m_staticText24;\r
-    wxStaticText* m_staticText25;\r
-\r
-    wxTextCtrl* m_textCtrlLabel0;\r
-    wxTextCtrl* m_textCtrlField0;\r
-    wxButton* m_buttonDel0;\r
-    wxTextCtrl* m_textCtrlLabel1;\r
-    wxTextCtrl* m_textCtrlField1;\r
-    wxButton* m_buttonDel1;\r
-    wxTextCtrl* m_textCtrlLabel2;\r
-    wxTextCtrl* m_textCtrlField2;\r
-    wxButton* m_buttonDel2;\r
-    wxTextCtrl* m_textCtrlLabel3;\r
-    wxTextCtrl* m_textCtrlField3;\r
-    wxButton* m_buttonDel3;\r
-    wxTextCtrl* m_textCtrlLabel4;\r
-    wxTextCtrl* m_textCtrlField4;\r
-    wxButton* m_buttonDel4;\r
-    wxTextCtrl* m_textCtrlLabel5;\r
-    wxTextCtrl* m_textCtrlField5;\r
-    wxButton* m_buttonDel5;\r
-    wxTextCtrl* m_textCtrlLabel6;\r
-    wxTextCtrl* m_textCtrlField6;\r
-    wxButton* m_buttonDel6;\r
-    wxTextCtrl* m_textCtrlLabel7;\r
-    wxTextCtrl* m_textCtrlField7;\r
-    wxButton* m_buttonDel7;\r
-    wxTextCtrl* m_textCtrlLabel8;\r
-    wxTextCtrl* m_textCtrlField8;\r
-    wxButton* m_buttonDel8;\r
-    wxTextCtrl* m_textCtrlLabel9;\r
-    wxTextCtrl* m_textCtrlField9;\r
-    wxButton* m_buttonDel9;\r
-    wxTextCtrl* m_textCtrlLabel10;\r
-    wxTextCtrl* m_textCtrlField10;\r
-    wxButton* m_buttonDel10;\r
-    wxTextCtrl* m_textCtrlLabel11;\r
-    wxTextCtrl* m_textCtrlField11;\r
-    wxButton* m_buttonDel11;\r
-    wxTextCtrl* m_textCtrlLabel12;\r
-    wxTextCtrl* m_textCtrlField12;\r
-    wxButton* m_buttonDel12;\r
-    wxTextCtrl* m_textCtrlLabel13;\r
-    wxTextCtrl* m_textCtrlField13;\r
-    wxButton* m_buttonDel13;\r
-    wxTextCtrl* m_textCtrlLabel14;\r
-    wxTextCtrl* m_textCtrlField14;\r
-    wxButton* m_buttonDel14;\r
-    wxTextCtrl* m_textCtrlLabel15;\r
-    wxTextCtrl* m_textCtrlField15;\r
-    wxButton* m_buttonDel15;\r
-    wxTextCtrl* m_textCtrlLabel16;\r
-    wxTextCtrl* m_textCtrlField16;\r
-    wxButton* m_buttonDel16;\r
-    wxTextCtrl* m_textCtrlLabel17;\r
-    wxTextCtrl* m_textCtrlField17;\r
-    wxButton* m_buttonDel17;\r
-    wxTextCtrl* m_textCtrlLabel18;\r
-    wxTextCtrl* m_textCtrlField18;\r
-    wxButton* m_buttonDel18;\r
-    wxTextCtrl* m_textCtrlLabel19;\r
-    wxTextCtrl* m_textCtrlField19;\r
-    wxButton* m_buttonDel19;\r
-    wxButton* m_buttonAddField;\r
-    wxButton* m_buttonOK;\r
-    wxButton* m_buttonPreview;\r
-    wxButton* m_buttonCancel;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel0(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel1(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel2(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel3(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel4(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel5(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel6(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel7(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel8(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel9(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel10(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel11(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel12(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel13(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel14(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel15(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel16(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel17(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel18(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDel19(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonAddField(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonSend(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonPreview(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    wxFlexGridSizer* fgSizer5;\r
-    CEditProductDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Edit Product"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(660,640), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);\r
-    ~CEditProductDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxScrolledWindow* m_scrolledWindow;\r
+               wxStaticText* m_staticText106;\r
+               wxComboBox* m_comboBoxCategory;\r
+               wxStaticText* m_staticText108;\r
+               wxTextCtrl* m_textCtrlTitle;\r
+               wxStaticText* m_staticText107;\r
+               wxTextCtrl* m_textCtrlPrice;\r
+               wxStaticText* m_staticText22;\r
+               wxTextCtrl* m_textCtrlDescription;\r
+               wxStaticText* m_staticText23;\r
+               wxTextCtrl* m_textCtrlInstructions;\r
+               wxStaticText* m_staticText24;\r
+               wxStaticText* m_staticText25;\r
+               \r
+               wxTextCtrl* m_textCtrlLabel0;\r
+               wxTextCtrl* m_textCtrlField0;\r
+               wxButton* m_buttonDel0;\r
+               wxTextCtrl* m_textCtrlLabel1;\r
+               wxTextCtrl* m_textCtrlField1;\r
+               wxButton* m_buttonDel1;\r
+               wxTextCtrl* m_textCtrlLabel2;\r
+               wxTextCtrl* m_textCtrlField2;\r
+               wxButton* m_buttonDel2;\r
+               wxTextCtrl* m_textCtrlLabel3;\r
+               wxTextCtrl* m_textCtrlField3;\r
+               wxButton* m_buttonDel3;\r
+               wxTextCtrl* m_textCtrlLabel4;\r
+               wxTextCtrl* m_textCtrlField4;\r
+               wxButton* m_buttonDel4;\r
+               wxTextCtrl* m_textCtrlLabel5;\r
+               wxTextCtrl* m_textCtrlField5;\r
+               wxButton* m_buttonDel5;\r
+               wxTextCtrl* m_textCtrlLabel6;\r
+               wxTextCtrl* m_textCtrlField6;\r
+               wxButton* m_buttonDel6;\r
+               wxTextCtrl* m_textCtrlLabel7;\r
+               wxTextCtrl* m_textCtrlField7;\r
+               wxButton* m_buttonDel7;\r
+               wxTextCtrl* m_textCtrlLabel8;\r
+               wxTextCtrl* m_textCtrlField8;\r
+               wxButton* m_buttonDel8;\r
+               wxTextCtrl* m_textCtrlLabel9;\r
+               wxTextCtrl* m_textCtrlField9;\r
+               wxButton* m_buttonDel9;\r
+               wxTextCtrl* m_textCtrlLabel10;\r
+               wxTextCtrl* m_textCtrlField10;\r
+               wxButton* m_buttonDel10;\r
+               wxTextCtrl* m_textCtrlLabel11;\r
+               wxTextCtrl* m_textCtrlField11;\r
+               wxButton* m_buttonDel11;\r
+               wxTextCtrl* m_textCtrlLabel12;\r
+               wxTextCtrl* m_textCtrlField12;\r
+               wxButton* m_buttonDel12;\r
+               wxTextCtrl* m_textCtrlLabel13;\r
+               wxTextCtrl* m_textCtrlField13;\r
+               wxButton* m_buttonDel13;\r
+               wxTextCtrl* m_textCtrlLabel14;\r
+               wxTextCtrl* m_textCtrlField14;\r
+               wxButton* m_buttonDel14;\r
+               wxTextCtrl* m_textCtrlLabel15;\r
+               wxTextCtrl* m_textCtrlField15;\r
+               wxButton* m_buttonDel15;\r
+               wxTextCtrl* m_textCtrlLabel16;\r
+               wxTextCtrl* m_textCtrlField16;\r
+               wxButton* m_buttonDel16;\r
+               wxTextCtrl* m_textCtrlLabel17;\r
+               wxTextCtrl* m_textCtrlField17;\r
+               wxButton* m_buttonDel17;\r
+               wxTextCtrl* m_textCtrlLabel18;\r
+               wxTextCtrl* m_textCtrlField18;\r
+               wxButton* m_buttonDel18;\r
+               wxTextCtrl* m_textCtrlLabel19;\r
+               wxTextCtrl* m_textCtrlField19;\r
+               wxButton* m_buttonDel19;\r
+               wxButton* m_buttonAddField;\r
+               wxButton* m_buttonOK;\r
+               wxButton* m_buttonPreview;\r
+               wxButton* m_buttonCancel;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel0( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel1( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel2( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel3( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel4( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel5( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel6( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel7( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel8( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel9( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel10( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel11( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel12( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel13( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel14( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel15( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel16( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel17( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel18( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDel19( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonAddField( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonSend( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonPreview( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               wxFlexGridSizer* fgSizer5;\r
+               CEditProductDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Edit Product"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 660,640 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+               ~CEditProductDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CViewProductDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CViewProductDialogBase : public wxFrame\r
+class CViewProductDialogBase : public wxFrame \r
 {\r
-private:\r
-\r
-protected:\r
-    wxHtmlWindow* m_htmlWinReviews;\r
-    wxScrolledWindow* m_scrolledWindow;\r
-    wxRichTextCtrl* m_richTextHeading;\r
-    wxStaticText* m_staticTextInstructions;\r
-    wxButton* m_buttonSubmitForm;\r
-    wxButton* m_buttonCancelForm;\r
-    wxButton* m_buttonBack;\r
-    wxButton* m_buttonNext;\r
-    wxButton* m_buttonCancel;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnButtonSubmitForm(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancelForm(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonBack(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonNext(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    CViewProductDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Order Form"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(630,520), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);\r
-    ~CViewProductDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxHtmlWindow* m_htmlWinReviews;\r
+               wxScrolledWindow* m_scrolledWindow;\r
+               wxRichTextCtrl* m_richTextHeading;\r
+               wxStaticText* m_staticTextInstructions;\r
+               wxButton* m_buttonSubmitForm;\r
+               wxButton* m_buttonCancelForm;\r
+               wxButton* m_buttonBack;\r
+               wxButton* m_buttonNext;\r
+               wxButton* m_buttonCancel;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnButtonSubmitForm( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancelForm( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonBack( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonNext( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CViewProductDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Order Form"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 630,520 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+               ~CViewProductDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CViewOrderDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CViewOrderDialogBase : public wxFrame\r
+class CViewOrderDialogBase : public wxFrame \r
 {\r
-private:\r
-\r
-protected:\r
-    wxHtmlWindow* m_htmlWin;\r
-    wxButton* m_buttonOK;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    CViewOrderDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("View Order"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(630,520), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);\r
-    ~CViewOrderDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxHtmlWindow* m_htmlWin;\r
+               wxButton* m_buttonOK;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CViewOrderDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("View Order"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 630,520 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+               ~CViewOrderDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CEditReviewDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CEditReviewDialogBase : public wxFrame\r
+class CEditReviewDialogBase : public wxFrame \r
 {\r
-private:\r
-\r
-protected:\r
-\r
-    wxStaticText* m_staticTextSeller;\r
-\r
-    wxStaticText* m_staticText110;\r
-    wxChoice* m_choiceStars;\r
-    wxStaticText* m_staticText43;\r
-    wxTextCtrl* m_textCtrlReview;\r
-    wxButton* m_buttonSubmit;\r
-    wxButton* m_buttonCancel;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }\r
-    virtual void OnButtonSubmit(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    CEditReviewDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Enter Review"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(630,440), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);\r
-    ~CEditReviewDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               \r
+               wxStaticText* m_staticTextSeller;\r
+               \r
+               wxStaticText* m_staticText110;\r
+               wxChoice* m_choiceStars;\r
+               wxStaticText* m_staticText43;\r
+               wxTextCtrl* m_textCtrlReview;\r
+               wxButton* m_buttonSubmit;\r
+               wxButton* m_buttonCancel;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonSubmit( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CEditReviewDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Enter Review"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 630,440 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+               ~CEditReviewDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CPokerLobbyDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CPokerLobbyDialogBase : public wxFrame\r
+class CPokerLobbyDialogBase : public wxFrame \r
 {\r
-private:\r
-\r
-protected:\r
-    wxTreeCtrl* m_treeCtrl;\r
-    wxListCtrl* m_listCtrl;\r
-    wxButton* m_buttonNewTable;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnTreeSelChanged(wxTreeEvent& event){ event.Skip(); }\r
-    virtual void OnListItemActivated(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnListItemSelected(wxListEvent& event){ event.Skip(); }\r
-    virtual void OnButtonNewTable(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    CPokerLobbyDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Poker Lobby"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(586,457), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL);\r
-    ~CPokerLobbyDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxTreeCtrl* m_treeCtrl;\r
+               wxListCtrl* m_listCtrl;\r
+               wxButton* m_buttonNewTable;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnTreeSelChanged( wxTreeEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonNewTable( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CPokerLobbyDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Poker Lobby"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 586,457 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );\r
+               ~CPokerLobbyDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CPokerDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CPokerDialogBase : public wxFrame\r
+class CPokerDialogBase : public wxFrame \r
 {\r
-private:\r
-\r
-protected:\r
-    wxButton* m_buttonDealHand;\r
-    wxButton* m_buttonFold;\r
-    wxButton* m_buttonCall;\r
-    wxButton* m_buttonRaise;\r
-    wxButton* m_buttonLeaveTable;\r
-    wxTextCtrl* m_textDitchPlayer;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }\r
-    virtual void OnMouseEvents(wxMouseEvent& event){ event.Skip(); }\r
-    virtual void OnPaint(wxPaintEvent& event){ event.Skip(); }\r
-    virtual void OnSize(wxSizeEvent& event){ event.Skip(); }\r
-    virtual void OnCheckSitOut(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonDealHand(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonFold(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCall(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonRaise(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonLeaveTable(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnDitchPlayer(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnCheckPreFold(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnCheckPreCall(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnCheckPreCallAny(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnCheckPreRaise(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnCheckPreRaiseAny(wxCommandEvent& event){ event.Skip(); }\r
-\r
-\r
-public:\r
-    wxCheckBox* m_checkSitOut;\r
-    wxCheckBox* m_checkPreFold;\r
-    wxCheckBox* m_checkPreCall;\r
-    wxCheckBox* m_checkPreCallAny;\r
-    wxCheckBox* m_checkPreRaise;\r
-    wxCheckBox* m_checkPreRaiseAny;\r
-    wxStatusBar* m_statusBar;\r
-    CPokerDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Poker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(806,550), long style = wxDEFAULT_FRAME_STYLE|wxFRAME_NO_TASKBAR|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL);\r
-    ~CPokerDialogBase();\r
-\r
+       private:\r
+       \r
+       protected:\r
+               wxButton* m_buttonDealHand;\r
+               wxButton* m_buttonFold;\r
+               wxButton* m_buttonCall;\r
+               wxButton* m_buttonRaise;\r
+               wxButton* m_buttonLeaveTable;\r
+               wxTextCtrl* m_textDitchPlayer;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }\r
+               virtual void OnMouseEvents( wxMouseEvent& event ){ event.Skip(); }\r
+               virtual void OnPaint( wxPaintEvent& event ){ event.Skip(); }\r
+               virtual void OnSize( wxSizeEvent& event ){ event.Skip(); }\r
+               virtual void OnCheckSitOut( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonDealHand( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonFold( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCall( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonRaise( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonLeaveTable( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnDitchPlayer( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnCheckPreFold( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnCheckPreCall( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnCheckPreCallAny( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnCheckPreRaise( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnCheckPreRaiseAny( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               wxCheckBox* m_checkSitOut;\r
+               wxCheckBox* m_checkPreFold;\r
+               wxCheckBox* m_checkPreCall;\r
+               wxCheckBox* m_checkPreCallAny;\r
+               wxCheckBox* m_checkPreRaise;\r
+               wxCheckBox* m_checkPreRaiseAny;\r
+               wxStatusBar* m_statusBar;\r
+               CPokerDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Poker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 806,550 ), long style = wxDEFAULT_FRAME_STYLE|wxFRAME_NO_TASKBAR|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );\r
+               ~CPokerDialogBase();\r
+       \r
 };\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CGetTextFromUserDialogBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class CGetTextFromUserDialogBase : public wxDialog\r
+class CGetTextFromUserDialogBase : public wxDialog \r
 {\r
-private:\r
-\r
-protected:\r
-\r
-    wxStaticText* m_staticTextMessage1;\r
-    wxTextCtrl* m_textCtrl1;\r
-    wxStaticText* m_staticTextMessage2;\r
-    wxTextCtrl* m_textCtrl2;\r
-\r
-\r
-    wxButton* m_buttonOK;\r
-    wxButton* m_buttonCancel;\r
-\r
-    // Virtual event handlers, overide them in your derived class\r
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }\r
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }\r
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }\r
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }\r
-\r
+       private:\r
+       \r
+       protected:\r
+               \r
+               wxStaticText* m_staticTextMessage1;\r
+               wxTextCtrl* m_textCtrl1;\r
+               wxStaticText* m_staticTextMessage2;\r
+               wxTextCtrl* m_textCtrl2;\r
+               \r
+               \r
+               wxButton* m_buttonOK;\r
+               wxButton* m_buttonCancel;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }\r
+               virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               CGetTextFromUserDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 403,138 ), long style = wxDEFAULT_DIALOG_STYLE );\r
+               ~CGetTextFromUserDialogBase();\r
+       \r
+};\r
 \r
-public:\r
-    CGetTextFromUserDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(403,138), long style = wxDEFAULT_DIALOG_STYLE);\r
-    ~CGetTextFromUserDialogBase();\r
+///////////////////////////////////////////////////////////////////////////////\r
+/// Class COptionsPanelBitcoinBase\r
+///////////////////////////////////////////////////////////////////////////////\r
+class COptionsPanelBitcoinBase : public wxPanel \r
+{\r
+       private:\r
+       \r
+       protected:\r
+               \r
+               wxStaticText* m_staticText32;\r
+               wxStaticText* m_staticText31;\r
+               \r
+               // Virtual event handlers, overide them in your derived class\r
+               virtual void OnKillFocusTransactionFee( wxFocusEvent& event ){ event.Skip(); }\r
+               \r
+       \r
+       public:\r
+               wxTextCtrl* m_textCtrlTransactionFee;\r
+               COptionsPanelBitcoinBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );\r
+               ~COptionsPanelBitcoinBase();\r
+       \r
+};\r
 \r
+///////////////////////////////////////////////////////////////////////////////\r
+/// Class COptionsPanelUIBase\r
+///////////////////////////////////////////////////////////////////////////////\r
+class COptionsPanelUIBase : public wxPanel \r
+{\r
+       private:\r
+       \r
+       protected:\r
+               \r
+       \r
+       public:\r
+               wxCheckBox* m_checkMinToTray;\r
+               wxCheckBox* m_checkCloseToTray;\r
+               wxCheckBox* m_checkStartOnSysBoot;\r
+               wxCheckBox* m_checkAskBeforeClosing;\r
+               wxCheckBox* m_checkAlwaysShowTray;\r
+               COptionsPanelUIBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );\r
+               ~COptionsPanelUIBase();\r
+       \r
 };\r
 \r
 #endif //__uibase__\r

diff --git a/uiproject.fbp b/uiproject.fbp
index 49b1fef..ccd8b22 100644 (file)
--- a/uiproject.fbp
+++ b/uiproject.fbp
@@ -18,7 +18,7 @@
         <property name="relative_path">1</property>\r
         <property name="use_enum">0</property>\r
         <property name="use_microsoft_bom">0</property>\r
-        <object class="Frame" expanded="0">\r
+        <object class="Frame" expanded="1">\r
             <property name="bg">wxSYS_COLOUR_BTNFACE</property>\r
             <property name="center"></property>\r
             <property name="context_help"></property>\r
@@ -48,7 +48,7 @@
             <event name="OnEnterWindow"></event>\r
             <event name="OnEraseBackground"></event>\r
             <event name="OnHibernate"></event>\r
-            <event name="OnIconize"></event>\r
+            <event name="OnIconize">OnIconize</event>\r
             <event name="OnIdle">OnIdle</event>\r
             <event name="OnKeyDown"></event>\r
             <event name="OnKeyUp"></event>\r
@@ -151,7 +151,7 @@
                         <property name="shortcut"></property>\r
                         <property name="unchecked_bitmap"></property>\r
                         <event name="OnMenuSelection">OnMenuOptionsGenerate</event>\r
-                        <event name="OnUpdateUI"></event>\r
+                        <event name="OnUpdateUI">OnUpdateMenuGenerate</event>\r
                     </object>\r
                     <object class="wxMenuItem" expanded="1">\r
                         <property name="bitmap"></property>\r
@@ -1665,7 +1665,7 @@
                 </object>\r
             </object>\r
         </object>\r
-        <object class="Dialog" expanded="0">\r
+        <object class="Dialog" expanded="1">\r
             <property name="bg"></property>\r
             <property name="center"></property>\r
             <property name="context_help"></property>\r
@@ -1679,7 +1679,7 @@
             <property name="minimum_size"></property>\r
             <property name="name">COptionsDialogBase</property>\r
             <property name="pos"></property>\r
-            <property name="size">500,261</property>\r
+            <property name="size">555,377</property>\r
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>\r
             <property name="subclass"></property>\r
             <property name="title">Options</property>\r
@@ -1724,28 +1724,18 @@
                 <property name="permission">none</property>\r
                 <object class="sizeritem" expanded="1">\r
                     <property name="border">5</property>\r
-                    <property name="flag">wxEXPAND|wxLEFT</property>\r
+                    <property name="flag">wxEXPAND</property>\r
                     <property name="proportion">1</property>\r
                     <object class="wxBoxSizer" expanded="1">\r
                         <property name="minimum_size"></property>\r
-                        <property name="name">bSizer57</property>\r
-                        <property name="orient">wxVERTICAL</property>\r
-                        <property name="permission">none</property>\r
-                        <object class="sizeritem" expanded="1">\r
-                            <property name="border">5</property>\r
-                            <property name="flag">wxEXPAND</property>\r
-                            <property name="proportion">0</property>\r
-                            <object class="spacer" expanded="1">\r
-                                <property name="height">20</property>\r
-                                <property name="permission">protected</property>\r
-                                <property name="width">0</property>\r
-                            </object>\r
-                        </object>\r
+                        <property name="name">panelSizer</property>\r
+                        <property name="orient">wxHORIZONTAL</property>\r
+                        <property name="permission">protected</property>\r
                         <object class="sizeritem" expanded="1">\r
                             <property name="border">5</property>\r
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
+                            <property name="flag">wxALL|wxEXPAND</property>\r
                             <property name="proportion">0</property>\r
-                            <object class="wxStaticText" expanded="1">\r
+                            <object class="wxTreeCtrl" expanded="1">\r
                                 <property name="bg"></property>\r
                                 <property name="context_help"></property>\r
                                 <property name="enabled">1</property>\r
@@ -1753,20 +1743,18 @@
                                 <property name="font"></property>\r
                                 <property name="hidden">0</property>\r
                                 <property name="id">wxID_ANY</property>\r
-                                <property name="label">Optional transaction fee you give to the nodes that process your transactions.</property>\r
                                 <property name="maximum_size"></property>\r
                                 <property name="minimum_size"></property>\r
-                                <property name="name">m_staticText32</property>\r
+                                <property name="name">m_treeCtrl</property>\r
                                 <property name="permission">protected</property>\r
                                 <property name="pos"></property>\r
-                                <property name="size"></property>\r
-                                <property name="style"></property>\r
+                                <property name="size">100,-1</property>\r
+                                <property name="style">wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT|wxTR_LINES_AT_ROOT</property>\r
                                 <property name="subclass"></property>\r
                                 <property name="tooltip"></property>\r
                                 <property name="window_extra_style"></property>\r
                                 <property name="window_name"></property>\r
                                 <property name="window_style"></property>\r
-                                <property name="wrap">-1</property>\r
                                 <event name="OnChar"></event>\r
                                 <event name="OnEnterWindow"></event>\r
                                 <event name="OnEraseBackground"></event>\r
@@ -1789,126 +1777,79 @@
                                 <event name="OnRightUp"></event>\r
                                 <event name="OnSetFocus"></event>\r
                                 <event name="OnSize"></event>\r
+                                <event name="OnTreeBeginDrag"></event>\r
+                                <event name="OnTreeBeginLabelEdit"></event>\r
+                                <event name="OnTreeBeginRDrag"></event>\r
+                                <event name="OnTreeDeleteItem"></event>\r
+                                <event name="OnTreeEndDrag"></event>\r
+                                <event name="OnTreeEndLabelEdit"></event>\r
+                                <event name="OnTreeGetInfo"></event>\r
+                                <event name="OnTreeItemActivated"></event>\r
+                                <event name="OnTreeItemCollapsed"></event>\r
+                                <event name="OnTreeItemCollapsing"></event>\r
+                                <event name="OnTreeItemExpanded"></event>\r
+                                <event name="OnTreeItemExpanding"></event>\r
+                                <event name="OnTreeItemGetTooltip"></event>\r
+                                <event name="OnTreeItemMenu"></event>\r
+                                <event name="OnTreeItemMiddleClick"></event>\r
+                                <event name="OnTreeItemRightClick"></event>\r
+                                <event name="OnTreeKeyDown"></event>\r
+                                <event name="OnTreeSelChanged">MenuSelChanged</event>\r
+                                <event name="OnTreeSelChanging"></event>\r
+                                <event name="OnTreeSetInfo"></event>\r
+                                <event name="OnTreeStateImageClick"></event>\r
                                 <event name="OnUpdateUI"></event>\r
                             </object>\r
                         </object>\r
-                        <object class="sizeritem" expanded="1">\r
-                            <property name="border">5</property>\r
-                            <property name="flag">wxEXPAND</property>\r
-                            <property name="proportion">0</property>\r
-                            <object class="wxBoxSizer" expanded="1">\r
-                                <property name="minimum_size"></property>\r
-                                <property name="name">bSizer56</property>\r
-                                <property name="orient">wxHORIZONTAL</property>\r
-                                <property name="permission">none</property>\r
-                                <object class="sizeritem" expanded="1">\r
-                                    <property name="border">5</property>\r
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>\r
-                                    <property name="proportion">0</property>\r
-                                    <object class="wxStaticText" expanded="1">\r
-                                        <property name="bg"></property>\r
-                                        <property name="context_help"></property>\r
-                                        <property name="enabled">1</property>\r
-                                        <property name="fg"></property>\r
-                                        <property name="font"></property>\r
-                                        <property name="hidden">0</property>\r
-                                        <property name="id">wxID_ANY</property>\r
-                                        <property name="label">Transaction fee:</property>\r
-                                        <property name="maximum_size"></property>\r
-                                        <property name="minimum_size"></property>\r
-                                        <property name="name">m_staticText31</property>\r
-                                        <property name="permission">protected</property>\r
-                                        <property name="pos"></property>\r
-                                        <property name="size"></property>\r
-                                        <property name="style"></property>\r
-                                        <property name="subclass"></property>\r
-                                        <property name="tooltip"></property>\r
-                                        <property name="window_extra_style"></property>\r
-                                        <property name="window_name"></property>\r
-                                        <property name="window_style"></property>\r
-                                        <property name="wrap">-1</property>\r
-                                        <event name="OnChar"></event>\r
-                                        <event name="OnEnterWindow"></event>\r
-                                        <event name="OnEraseBackground"></event>\r
-                                        <event name="OnKeyDown"></event>\r
-                                        <event name="OnKeyUp"></event>\r
-                                        <event name="OnKillFocus"></event>\r
-                                        <event name="OnLeaveWindow"></event>\r
-                                        <event name="OnLeftDClick"></event>\r
-                                        <event name="OnLeftDown"></event>\r
-                                        <event name="OnLeftUp"></event>\r
-                                        <event name="OnMiddleDClick"></event>\r
-                                        <event name="OnMiddleDown"></event>\r
-                                        <event name="OnMiddleUp"></event>\r
-                                        <event name="OnMotion"></event>\r
-                                        <event name="OnMouseEvents"></event>\r
-                                        <event name="OnMouseWheel"></event>\r
-                                        <event name="OnPaint"></event>\r
-                                        <event name="OnRightDClick"></event>\r
-                                        <event name="OnRightDown"></event>\r
-                                        <event name="OnRightUp"></event>\r
-                                        <event name="OnSetFocus"></event>\r
-                                        <event name="OnSize"></event>\r
-                                        <event name="OnUpdateUI"></event>\r
-                                    </object>\r
-                                </object>\r
-                                <object class="sizeritem" expanded="1">\r
-                                    <property name="border">5</property>\r
-                                    <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>\r
-                                    <property name="proportion">0</property>\r
-                                    <object class="wxTextCtrl" expanded="1">\r
-                                        <property name="bg"></property>\r
-                                        <property name="context_help"></property>\r
-                                        <property name="enabled">1</property>\r
-                                        <property name="fg"></property>\r
-                                        <property name="font"></property>\r
-                                        <property name="hidden">0</property>\r
-                                        <property name="id">wxID_TRANSACTIONFEE</property>\r
-                                        <property name="maximum_size"></property>\r
-                                        <property name="maxlength">0</property>\r
-                                        <property name="minimum_size"></property>\r
-                                        <property name="name">m_textCtrlTransactionFee</property>\r
-                                        <property name="permission">protected</property>\r
-                                        <property name="pos"></property>\r
-                                        <property name="size">70,-1</property>\r
-                                        <property name="style"></property>\r
-                                        <property name="subclass"></property>\r
-                                        <property name="tooltip"></property>\r
-                                        <property name="value"></property>\r
-                                        <property name="window_extra_style"></property>\r
-                                        <property name="window_name"></property>\r
-                                        <property name="window_style"></property>\r
-                                        <event name="OnChar"></event>\r
-                                        <event name="OnEnterWindow"></event>\r
-                                        <event name="OnEraseBackground"></event>\r
-                                        <event name="OnKeyDown"></event>\r
-                                        <event name="OnKeyUp"></event>\r
-                                        <event name="OnKillFocus">OnKillFocusTransactionFee</event>\r
-                                        <event name="OnLeaveWindow"></event>\r
-                                        <event name="OnLeftDClick"></event>\r
-                                        <event name="OnLeftDown"></event>\r
-                                        <event name="OnLeftUp"></event>\r
-                                        <event name="OnMiddleDClick"></event>\r
-                                        <event name="OnMiddleDown"></event>\r
-                                        <event name="OnMiddleUp"></event>\r
-                                        <event name="OnMotion"></event>\r
-                                        <event name="OnMouseEvents"></event>\r
-                                        <event name="OnMouseWheel"></event>\r
-                                        <event name="OnPaint"></event>\r
-                                        <event name="OnRightDClick"></event>\r
-                                        <event name="OnRightDown"></event>\r
-                                        <event name="OnRightUp"></event>\r
-                                        <event name="OnSetFocus"></event>\r
-                                        <event name="OnSize"></event>\r
-                                        <event name="OnText"></event>\r
-                                        <event name="OnTextEnter"></event>\r
-                                        <event name="OnTextMaxLen"></event>\r
-                                        <event name="OnTextURL"></event>\r
-                                        <event name="OnUpdateUI"></event>\r
-                                    </object>\r
-                                </object>\r
-                            </object>\r
-                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxEXPAND | wxALL</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="wxStaticLine" expanded="1">\r
+                        <property name="bg"></property>\r
+                        <property name="context_help"></property>\r
+                        <property name="enabled">1</property>\r
+                        <property name="fg"></property>\r
+                        <property name="font"></property>\r
+                        <property name="hidden">0</property>\r
+                        <property name="id">wxID_ANY</property>\r
+                        <property name="maximum_size"></property>\r
+                        <property name="minimum_size"></property>\r
+                        <property name="name">m_staticline1</property>\r
+                        <property name="permission">protected</property>\r
+                        <property name="pos"></property>\r
+                        <property name="size"></property>\r
+                        <property name="style">wxLI_HORIZONTAL</property>\r
+                        <property name="subclass"></property>\r
+                        <property name="tooltip"></property>\r
+                        <property name="window_extra_style"></property>\r
+                        <property name="window_name"></property>\r
+                        <property name="window_style"></property>\r
+                        <event name="OnChar"></event>\r
+                        <event name="OnEnterWindow"></event>\r
+                        <event name="OnEraseBackground"></event>\r
+                        <event name="OnKeyDown"></event>\r
+                        <event name="OnKeyUp"></event>\r
+                        <event name="OnKillFocus"></event>\r
+                        <event name="OnLeaveWindow"></event>\r
+                        <event name="OnLeftDClick"></event>\r
+                        <event name="OnLeftDown"></event>\r
+                        <event name="OnLeftUp"></event>\r
+                        <event name="OnMiddleDClick"></event>\r
+                        <event name="OnMiddleDown"></event>\r
+                        <event name="OnMiddleUp"></event>\r
+                        <event name="OnMotion"></event>\r
+                        <event name="OnMouseEvents"></event>\r
+                        <event name="OnMouseWheel"></event>\r
+                        <event name="OnPaint"></event>\r
+                        <event name="OnRightDClick"></event>\r
+                        <event name="OnRightDown"></event>\r
+                        <event name="OnRightUp"></event>\r
+                        <event name="OnSetFocus"></event>\r
+                        <event name="OnSize"></event>\r
+                        <event name="OnUpdateUI"></event>\r
                     </object>\r
                 </object>\r
                 <object class="sizeritem" expanded="1">\r
@@ -2024,6 +1965,58 @@
                                 <event name="OnUpdateUI"></event>\r
                             </object>\r
                         </object>\r
+                        <object class="sizeritem" expanded="1">\r
+                            <property name="border">5</property>\r
+                            <property name="flag">wxALL</property>\r
+                            <property name="proportion">0</property>\r
+                            <object class="wxButton" expanded="1">\r
+                                <property name="bg"></property>\r
+                                <property name="context_help"></property>\r
+                                <property name="default">0</property>\r
+                                <property name="enabled">0</property>\r
+                                <property name="fg"></property>\r
+                                <property name="font"></property>\r
+                                <property name="hidden">1</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="label">Apply</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="name">m_buttonApply</property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pos"></property>\r
+                                <property name="size"></property>\r
+                                <property name="style"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <event name="OnButtonClick"></event>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
                     </object>\r
                 </object>\r
             </object>\r
@@ -11856,5 +11849,551 @@
                 </object>\r
             </object>\r
         </object>\r
+        <object class="Panel" expanded="1">\r
+            <property name="bg"></property>\r
+            <property name="context_help"></property>\r
+            <property name="enabled">1</property>\r
+            <property name="fg"></property>\r
+            <property name="font"></property>\r
+            <property name="hidden">0</property>\r
+            <property name="id">wxID_ANY</property>\r
+            <property name="maximum_size"></property>\r
+            <property name="minimum_size"></property>\r
+            <property name="name">COptionsPanelBitcoinBase</property>\r
+            <property name="pos"></property>\r
+            <property name="size">-1,-1</property>\r
+            <property name="subclass"></property>\r
+            <property name="tooltip"></property>\r
+            <property name="window_extra_style"></property>\r
+            <property name="window_name"></property>\r
+            <property name="window_style">wxTAB_TRAVERSAL</property>\r
+            <event name="OnChar"></event>\r
+            <event name="OnEnterWindow"></event>\r
+            <event name="OnEraseBackground"></event>\r
+            <event name="OnInitDialog"></event>\r
+            <event name="OnKeyDown"></event>\r
+            <event name="OnKeyUp"></event>\r
+            <event name="OnKillFocus"></event>\r
+            <event name="OnLeaveWindow"></event>\r
+            <event name="OnLeftDClick"></event>\r
+            <event name="OnLeftDown"></event>\r
+            <event name="OnLeftUp"></event>\r
+            <event name="OnMiddleDClick"></event>\r
+            <event name="OnMiddleDown"></event>\r
+            <event name="OnMiddleUp"></event>\r
+            <event name="OnMotion"></event>\r
+            <event name="OnMouseEvents"></event>\r
+            <event name="OnMouseWheel"></event>\r
+            <event name="OnPaint"></event>\r
+            <event name="OnRightDClick"></event>\r
+            <event name="OnRightDown"></event>\r
+            <event name="OnRightUp"></event>\r
+            <event name="OnSetFocus"></event>\r
+            <event name="OnSize"></event>\r
+            <event name="OnUpdateUI"></event>\r
+            <object class="wxBoxSizer" expanded="1">\r
+                <property name="minimum_size"></property>\r
+                <property name="name">bSizer62</property>\r
+                <property name="orient">wxVERTICAL</property>\r
+                <property name="permission">none</property>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxEXPAND</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="spacer" expanded="1">\r
+                        <property name="height">20</property>\r
+                        <property name="permission">protected</property>\r
+                        <property name="width">0</property>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="wxStaticText" expanded="1">\r
+                        <property name="bg"></property>\r
+                        <property name="context_help"></property>\r
+                        <property name="enabled">1</property>\r
+                        <property name="fg"></property>\r
+                        <property name="font"></property>\r
+                        <property name="hidden">0</property>\r
+                        <property name="id">wxID_ANY</property>\r
+                        <property name="label">Optional transaction fee you give to the nodes that process your transactions.</property>\r
+                        <property name="maximum_size"></property>\r
+                        <property name="minimum_size"></property>\r
+                        <property name="name">m_staticText32</property>\r
+                        <property name="permission">protected</property>\r
+                        <property name="pos"></property>\r
+                        <property name="size"></property>\r
+                        <property name="style"></property>\r
+                        <property name="subclass"></property>\r
+                        <property name="tooltip"></property>\r
+                        <property name="window_extra_style"></property>\r
+                        <property name="window_name"></property>\r
+                        <property name="window_style"></property>\r
+                        <property name="wrap">-1</property>\r
+                        <event name="OnChar"></event>\r
+                        <event name="OnEnterWindow"></event>\r
+                        <event name="OnEraseBackground"></event>\r
+                        <event name="OnKeyDown"></event>\r
+                        <event name="OnKeyUp"></event>\r
+                        <event name="OnKillFocus"></event>\r
+                        <event name="OnLeaveWindow"></event>\r
+                        <event name="OnLeftDClick"></event>\r
+                        <event name="OnLeftDown"></event>\r
+                        <event name="OnLeftUp"></event>\r
+                        <event name="OnMiddleDClick"></event>\r
+                        <event name="OnMiddleDown"></event>\r
+                        <event name="OnMiddleUp"></event>\r
+                        <event name="OnMotion"></event>\r
+                        <event name="OnMouseEvents"></event>\r
+                        <event name="OnMouseWheel"></event>\r
+                        <event name="OnPaint"></event>\r
+                        <event name="OnRightDClick"></event>\r
+                        <event name="OnRightDown"></event>\r
+                        <event name="OnRightUp"></event>\r
+                        <event name="OnSetFocus"></event>\r
+                        <event name="OnSize"></event>\r
+                        <event name="OnUpdateUI"></event>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxEXPAND</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="wxBoxSizer" expanded="1">\r
+                        <property name="minimum_size"></property>\r
+                        <property name="name">bSizer56</property>\r
+                        <property name="orient">wxHORIZONTAL</property>\r
+                        <property name="permission">none</property>\r
+                        <object class="sizeritem" expanded="1">\r
+                            <property name="border">5</property>\r
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>\r
+                            <property name="proportion">0</property>\r
+                            <object class="wxStaticText" expanded="1">\r
+                                <property name="bg"></property>\r
+                                <property name="context_help"></property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="font"></property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="label">Transaction fee:</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="name">m_staticText31</property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pos"></property>\r
+                                <property name="size"></property>\r
+                                <property name="style"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <property name="wrap">-1</property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem" expanded="1">\r
+                            <property name="border">5</property>\r
+                            <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>\r
+                            <property name="proportion">0</property>\r
+                            <object class="wxTextCtrl" expanded="1">\r
+                                <property name="bg"></property>\r
+                                <property name="context_help"></property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="font"></property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_TRANSACTIONFEE</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="maxlength">0</property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="name">m_textCtrlTransactionFee</property>\r
+                                <property name="permission">public</property>\r
+                                <property name="pos"></property>\r
+                                <property name="size">70,-1</property>\r
+                                <property name="style"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="value"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style"></property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus">OnKillFocusTransactionFee</event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnText"></event>\r
+                                <event name="OnTextEnter"></event>\r
+                                <event name="OnTextMaxLen"></event>\r
+                                <event name="OnTextURL"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="Panel" expanded="1">\r
+            <property name="bg"></property>\r
+            <property name="context_help"></property>\r
+            <property name="enabled">1</property>\r
+            <property name="fg"></property>\r
+            <property name="font"></property>\r
+            <property name="hidden">0</property>\r
+            <property name="id">wxID_ANY</property>\r
+            <property name="maximum_size"></property>\r
+            <property name="minimum_size"></property>\r
+            <property name="name">COptionsPanelUIBase</property>\r
+            <property name="pos"></property>\r
+            <property name="size">-1,-1</property>\r
+            <property name="subclass"></property>\r
+            <property name="tooltip"></property>\r
+            <property name="window_extra_style"></property>\r
+            <property name="window_name"></property>\r
+            <property name="window_style">wxTAB_TRAVERSAL</property>\r
+            <event name="OnChar"></event>\r
+            <event name="OnEnterWindow"></event>\r
+            <event name="OnEraseBackground"></event>\r
+            <event name="OnInitDialog"></event>\r
+            <event name="OnKeyDown"></event>\r
+            <event name="OnKeyUp"></event>\r
+            <event name="OnKillFocus"></event>\r
+            <event name="OnLeaveWindow"></event>\r
+            <event name="OnLeftDClick"></event>\r
+            <event name="OnLeftDown"></event>\r
+            <event name="OnLeftUp"></event>\r
+            <event name="OnMiddleDClick"></event>\r
+            <event name="OnMiddleDown"></event>\r
+            <event name="OnMiddleUp"></event>\r
+            <event name="OnMotion"></event>\r
+            <event name="OnMouseEvents"></event>\r
+            <event name="OnMouseWheel"></event>\r
+            <event name="OnPaint"></event>\r
+            <event name="OnRightDClick"></event>\r
+            <event name="OnRightDown"></event>\r
+            <event name="OnRightUp"></event>\r
+            <event name="OnSetFocus"></event>\r
+            <event name="OnSize"></event>\r
+            <event name="OnUpdateUI"></event>\r
+            <object class="wxBoxSizer" expanded="1">\r
+                <property name="minimum_size"></property>\r
+                <property name="name">bSizer57</property>\r
+                <property name="orient">wxVERTICAL</property>\r
+                <property name="permission">none</property>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxEXPAND</property>\r
+                    <property name="proportion">1</property>\r
+                    <object class="spacer" expanded="1">\r
+                        <property name="height">20</property>\r
+                        <property name="permission">protected</property>\r
+                        <property name="width">0</property>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxALL</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="wxCheckBox" expanded="1">\r
+                        <property name="bg"></property>\r
+                        <property name="checked">0</property>\r
+                        <property name="context_help"></property>\r
+                        <property name="enabled">1</property>\r
+                        <property name="fg"></property>\r
+                        <property name="font"></property>\r
+                        <property name="hidden">0</property>\r
+                        <property name="id">wxID_MINTOTRAY</property>\r
+                        <property name="label">Minimize to tray</property>\r
+                        <property name="maximum_size"></property>\r
+                        <property name="minimum_size"></property>\r
+                        <property name="name">m_checkMinToTray</property>\r
+                        <property name="permission">public</property>\r
+                        <property name="pos"></property>\r
+                        <property name="size"></property>\r
+                        <property name="style"></property>\r
+                        <property name="subclass"></property>\r
+                        <property name="tooltip"></property>\r
+                        <property name="window_extra_style"></property>\r
+                        <property name="window_name"></property>\r
+                        <property name="window_style"></property>\r
+                        <event name="OnChar"></event>\r
+                        <event name="OnCheckBox"></event>\r
+                        <event name="OnEnterWindow"></event>\r
+                        <event name="OnEraseBackground"></event>\r
+                        <event name="OnKeyDown"></event>\r
+                        <event name="OnKeyUp"></event>\r
+                        <event name="OnKillFocus"></event>\r
+                        <event name="OnLeaveWindow"></event>\r
+                        <event name="OnLeftDClick"></event>\r
+                        <event name="OnLeftDown"></event>\r
+                        <event name="OnLeftUp"></event>\r
+                        <event name="OnMiddleDClick"></event>\r
+                        <event name="OnMiddleDown"></event>\r
+                        <event name="OnMiddleUp"></event>\r
+                        <event name="OnMotion"></event>\r
+                        <event name="OnMouseEvents"></event>\r
+                        <event name="OnMouseWheel"></event>\r
+                        <event name="OnPaint"></event>\r
+                        <event name="OnRightDClick"></event>\r
+                        <event name="OnRightDown"></event>\r
+                        <event name="OnRightUp"></event>\r
+                        <event name="OnSetFocus"></event>\r
+                        <event name="OnSize"></event>\r
+                        <event name="OnUpdateUI"></event>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxALL</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="wxCheckBox" expanded="1">\r
+                        <property name="bg"></property>\r
+                        <property name="checked">0</property>\r
+                        <property name="context_help"></property>\r
+                        <property name="enabled">1</property>\r
+                        <property name="fg"></property>\r
+                        <property name="font"></property>\r
+                        <property name="hidden">0</property>\r
+                        <property name="id">wxID_ANY</property>\r
+                        <property name="label">Close to tray</property>\r
+                        <property name="maximum_size"></property>\r
+                        <property name="minimum_size"></property>\r
+                        <property name="name">m_checkCloseToTray</property>\r
+                        <property name="permission">public</property>\r
+                        <property name="pos"></property>\r
+                        <property name="size"></property>\r
+                        <property name="style"></property>\r
+                        <property name="subclass"></property>\r
+                        <property name="tooltip"></property>\r
+                        <property name="window_extra_style"></property>\r
+                        <property name="window_name"></property>\r
+                        <property name="window_style"></property>\r
+                        <event name="OnChar"></event>\r
+                        <event name="OnCheckBox"></event>\r
+                        <event name="OnEnterWindow"></event>\r
+                        <event name="OnEraseBackground"></event>\r
+                        <event name="OnKeyDown"></event>\r
+                        <event name="OnKeyUp"></event>\r
+                        <event name="OnKillFocus"></event>\r
+                        <event name="OnLeaveWindow"></event>\r
+                        <event name="OnLeftDClick"></event>\r
+                        <event name="OnLeftDown"></event>\r
+                        <event name="OnLeftUp"></event>\r
+                        <event name="OnMiddleDClick"></event>\r
+                        <event name="OnMiddleDown"></event>\r
+                        <event name="OnMiddleUp"></event>\r
+                        <event name="OnMotion"></event>\r
+                        <event name="OnMouseEvents"></event>\r
+                        <event name="OnMouseWheel"></event>\r
+                        <event name="OnPaint"></event>\r
+                        <event name="OnRightDClick"></event>\r
+                        <event name="OnRightDown"></event>\r
+                        <event name="OnRightUp"></event>\r
+                        <event name="OnSetFocus"></event>\r
+                        <event name="OnSize"></event>\r
+                        <event name="OnUpdateUI"></event>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxALL</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="wxCheckBox" expanded="1">\r
+                        <property name="bg"></property>\r
+                        <property name="checked">0</property>\r
+                        <property name="context_help"></property>\r
+                        <property name="enabled">1</property>\r
+                        <property name="fg"></property>\r
+                        <property name="font"></property>\r
+                        <property name="hidden">0</property>\r
+                        <property name="id">wxID_ANY</property>\r
+                        <property name="label">Start on system boot</property>\r
+                        <property name="maximum_size"></property>\r
+                        <property name="minimum_size"></property>\r
+                        <property name="name">m_checkStartOnSysBoot</property>\r
+                        <property name="permission">public</property>\r
+                        <property name="pos"></property>\r
+                        <property name="size"></property>\r
+                        <property name="style"></property>\r
+                        <property name="subclass"></property>\r
+                        <property name="tooltip"></property>\r
+                        <property name="window_extra_style"></property>\r
+                        <property name="window_name"></property>\r
+                        <property name="window_style"></property>\r
+                        <event name="OnChar"></event>\r
+                        <event name="OnCheckBox"></event>\r
+                        <event name="OnEnterWindow"></event>\r
+                        <event name="OnEraseBackground"></event>\r
+                        <event name="OnKeyDown"></event>\r
+                        <event name="OnKeyUp"></event>\r
+                        <event name="OnKillFocus"></event>\r
+                        <event name="OnLeaveWindow"></event>\r
+                        <event name="OnLeftDClick"></event>\r
+                        <event name="OnLeftDown"></event>\r
+                        <event name="OnLeftUp"></event>\r
+                        <event name="OnMiddleDClick"></event>\r
+                        <event name="OnMiddleDown"></event>\r
+                        <event name="OnMiddleUp"></event>\r
+                        <event name="OnMotion"></event>\r
+                        <event name="OnMouseEvents"></event>\r
+                        <event name="OnMouseWheel"></event>\r
+                        <event name="OnPaint"></event>\r
+                        <event name="OnRightDClick"></event>\r
+                        <event name="OnRightDown"></event>\r
+                        <event name="OnRightUp"></event>\r
+                        <event name="OnSetFocus"></event>\r
+                        <event name="OnSize"></event>\r
+                        <event name="OnUpdateUI"></event>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxALL</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="wxCheckBox" expanded="1">\r
+                        <property name="bg"></property>\r
+                        <property name="checked">0</property>\r
+                        <property name="context_help"></property>\r
+                        <property name="enabled">1</property>\r
+                        <property name="fg"></property>\r
+                        <property name="font"></property>\r
+                        <property name="hidden">0</property>\r
+                        <property name="id">wxID_ANY</property>\r
+                        <property name="label">Ask before closing</property>\r
+                        <property name="maximum_size"></property>\r
+                        <property name="minimum_size"></property>\r
+                        <property name="name">m_checkAskBeforeClosing</property>\r
+                        <property name="permission">public</property>\r
+                        <property name="pos"></property>\r
+                        <property name="size"></property>\r
+                        <property name="style"></property>\r
+                        <property name="subclass"></property>\r
+                        <property name="tooltip"></property>\r
+                        <property name="window_extra_style"></property>\r
+                        <property name="window_name"></property>\r
+                        <property name="window_style"></property>\r
+                        <event name="OnChar"></event>\r
+                        <event name="OnCheckBox"></event>\r
+                        <event name="OnEnterWindow"></event>\r
+                        <event name="OnEraseBackground"></event>\r
+                        <event name="OnKeyDown"></event>\r
+                        <event name="OnKeyUp"></event>\r
+                        <event name="OnKillFocus"></event>\r
+                        <event name="OnLeaveWindow"></event>\r
+                        <event name="OnLeftDClick"></event>\r
+                        <event name="OnLeftDown"></event>\r
+                        <event name="OnLeftUp"></event>\r
+                        <event name="OnMiddleDClick"></event>\r
+                        <event name="OnMiddleDown"></event>\r
+                        <event name="OnMiddleUp"></event>\r
+                        <event name="OnMotion"></event>\r
+                        <event name="OnMouseEvents"></event>\r
+                        <event name="OnMouseWheel"></event>\r
+                        <event name="OnPaint"></event>\r
+                        <event name="OnRightDClick"></event>\r
+                        <event name="OnRightDown"></event>\r
+                        <event name="OnRightUp"></event>\r
+                        <event name="OnSetFocus"></event>\r
+                        <event name="OnSize"></event>\r
+                        <event name="OnUpdateUI"></event>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem" expanded="1">\r
+                    <property name="border">5</property>\r
+                    <property name="flag">wxALL</property>\r
+                    <property name="proportion">0</property>\r
+                    <object class="wxCheckBox" expanded="1">\r
+                        <property name="bg"></property>\r
+                        <property name="checked">0</property>\r
+                        <property name="context_help"></property>\r
+                        <property name="enabled">1</property>\r
+                        <property name="fg"></property>\r
+                        <property name="font"></property>\r
+                        <property name="hidden">0</property>\r
+                        <property name="id">wxID_ANY</property>\r
+                        <property name="label">Always show tray icon</property>\r
+                        <property name="maximum_size"></property>\r
+                        <property name="minimum_size"></property>\r
+                        <property name="name">m_checkAlwaysShowTray</property>\r
+                        <property name="permission">public</property>\r
+                        <property name="pos"></property>\r
+                        <property name="size"></property>\r
+                        <property name="style"></property>\r
+                        <property name="subclass"></property>\r
+                        <property name="tooltip"></property>\r
+                        <property name="window_extra_style"></property>\r
+                        <property name="window_name"></property>\r
+                        <property name="window_style"></property>\r
+                        <event name="OnChar"></event>\r
+                        <event name="OnCheckBox"></event>\r
+                        <event name="OnEnterWindow"></event>\r
+                        <event name="OnEraseBackground"></event>\r
+                        <event name="OnKeyDown"></event>\r
+                        <event name="OnKeyUp"></event>\r
+                        <event name="OnKillFocus"></event>\r
+                        <event name="OnLeaveWindow"></event>\r
+                        <event name="OnLeftDClick"></event>\r
+                        <event name="OnLeftDown"></event>\r
+                        <event name="OnLeftUp"></event>\r
+                        <event name="OnMiddleDClick"></event>\r
+                        <event name="OnMiddleDown"></event>\r
+                        <event name="OnMiddleUp"></event>\r
+                        <event name="OnMotion"></event>\r
+                        <event name="OnMouseEvents"></event>\r
+                        <event name="OnMouseWheel"></event>\r
+                        <event name="OnPaint"></event>\r
+                        <event name="OnRightDClick"></event>\r
+                        <event name="OnRightDown"></event>\r
+                        <event name="OnRightUp"></event>\r
+                        <event name="OnSetFocus"></event>\r
+                        <event name="OnSize"></event>\r
+                        <event name="OnUpdateUI"></event>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
     </object>\r
 </wxFormBuilder_Project>\r