From d1ea269ec6f015fd8e918a2791b5fc1c3a694114 Mon Sep 17 00:00:00 2001
From: rjongbloed <rjongbloed>
Date: Thu, 10 May 2007 01:03:53 +0000
Subject: [PATCH] Updated build for wxWidgets 2.8.x

---
 samples/openphone/OpenPhone_2005.vcproj |  4 ++--
 samples/openphone/main.cxx              | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/samples/openphone/OpenPhone_2005.vcproj b/samples/openphone/OpenPhone_2005.vcproj
index ad89195f..7969a1f3 100644
--- a/samples/openphone/OpenPhone_2005.vcproj
+++ b/samples/openphone/OpenPhone_2005.vcproj
@@ -79,7 +79,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opals.lib ptlibs.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wsock32.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib user32.lib ole32.lib advapi32.lib shell32.lib"
+				AdditionalDependencies="opals.lib ptlibs.lib wxmsw$(WXVER)_xrc.lib wxmsw$(WXVER)_html.lib wxmsw$(WXVER)_adv.lib wxmsw$(WXVER)_core.lib wxbase$(WXVER)_xml.lib wxbase$(WXVER).lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wsock32.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib user32.lib ole32.lib advapi32.lib shell32.lib"
 				OutputFile=".\Release/OpenPhone.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -177,7 +177,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opalsd.lib ptlibsd.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wsock32.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib oleaut32.lib"
+				AdditionalDependencies="opalsd.lib ptlibsd.lib wxmsw$(WXVER)d_xrc.lib wxmsw$(WXVER)d_html.lib wxmsw$(WXVER)d_adv.lib wxmsw$(WXVER)d_core.lib wxbase$(WXVER)d_xml.lib wxbase$(WXVER)d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wsock32.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib oleaut32.lib"
 				OutputFile=".\Debug/OpenPhone.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
diff --git a/samples/openphone/main.cxx b/samples/openphone/main.cxx
index 72786000..2ff4827b 100644
--- a/samples/openphone/main.cxx
+++ b/samples/openphone/main.cxx
@@ -25,6 +25,9 @@
  * Contributor(s): 
  *
  * $Log$
+ * Revision 1.17  2007/05/10 01:03:54  rjongbloed
+ * Updated build for wxWidgets 2.8.x
+ *
  * Revision 1.16  2007/04/03 07:59:13  rjongbloed
  * Warning: API change to PCSS callbacks:
  *   changed return on OnShowIncoming to BOOL, now agrees with
@@ -192,6 +195,7 @@
 #include <wx/listctrl.h>
 #include <wx/splitter.h>
 #include <wx/valgen.h>
+#include <wx/notebook.h>
 #undef LoadMenu // Bizarre but necessary before the xml code
 #include <wx/xrc/xmlres.h>
 
@@ -330,7 +334,7 @@ static const char SpeedDialNumberKey[] = "Number";
 static const char SpeedDialDescriptionKey[] = "Description";
 
 static const char RecentCallsGroup[] = "/Recent Calls";
-static const int  MaxSavedRecentCalls = 10;
+static const size_t MaxSavedRecentCalls = 10;
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2097,7 +2101,7 @@ bool OptionsDialog::TransferDataFromWindow()
   for (mm = m_manager.m_mediaInfo.begin(); mm != m_manager.m_mediaInfo.end(); ++mm)
     mm->preferenceOrder = -1;
 
-  int codecIndex;
+  size_t codecIndex;
   for (codecIndex = 0; codecIndex < m_selectedCodecs->GetCount(); codecIndex++) {
     PwxString selectedFormat = m_selectedCodecs->GetString(codecIndex);
     for (mm = m_manager.m_mediaInfo.begin(); mm != m_manager.m_mediaInfo.end(); ++mm) {
@@ -2136,7 +2140,7 @@ bool OptionsDialog::TransferDataFromWindow()
   config->SetPath(H323AliasesGroup);
   m_manager.h323EP->SetLocalUserName(m_Username);
   PStringList aliases = m_manager.h323EP->GetAliasNames();
-  for (int i = 0; i < m_Aliases->GetCount(); i++) {
+  for (size_t i = 0; i < m_Aliases->GetCount(); i++) {
     wxString alias = m_Aliases->GetString(i);
     m_manager.h323EP->AddAliasName(alias.c_str());
     wxString key;
@@ -2384,7 +2388,7 @@ void OptionsDialog::MoveDownCodec(wxCommandEvent & /*event*/)
   m_selectedCodecs->InsertItems(1, &value, selections[0]+1);
   m_selectedCodecs->SetSelection(selections[0]+1);
   m_MoveUpCodec->Enable(true);
-  m_MoveDownCodec->Enable(selections[0] < m_selectedCodecs->GetCount()-2);
+  m_MoveDownCodec->Enable(selections[0] < (int)m_selectedCodecs->GetCount()-2);
 }
 
 
@@ -2398,10 +2402,10 @@ void OptionsDialog::SelectedCodecToAdd(wxCommandEvent & /*event*/)
 void OptionsDialog::SelectedCodec(wxCommandEvent & /*event*/)
 {
   wxArrayInt selections;
-  int count = m_selectedCodecs->GetSelections(selections);
+  size_t count = m_selectedCodecs->GetSelections(selections);
   m_RemoveCodec->Enable(count > 0);
   m_MoveUpCodec->Enable(count == 1 && selections[0] > 0);
-  m_MoveDownCodec->Enable(count == 1 && selections[0] < m_selectedCodecs->GetCount()-1);
+  m_MoveDownCodec->Enable(count == 1 && selections[0] < (int)m_selectedCodecs->GetCount()-1);
 
   m_codecOptions->DeleteAllItems();
   m_codecOptionValue->SetValue("");
@@ -2577,15 +2581,13 @@ CallDialog::CallDialog(wxFrame * parent)
 
 void CallDialog::OnOK(wxCommandEvent & event)
 {
-  wxDialog::OnOK(event);
-
   bool addNewEntry = true;
 
   wxConfigBase * config = wxConfig::Get();
   config->DeleteGroup(RecentCallsGroup);
   config->SetPath(RecentCallsGroup);
 
-  int index;
+  size_t index;
   for (index = 0; index < m_AddressCtrl->GetCount(); ++index) {
     wxString entry = m_AddressCtrl->GetString(index);
 
-- 
2.11.4.GIT