[Amis-vcs] SF.net SVN: amis: [2449] branches/amis3
Brought to you by:
julienq,
marisademeglio
Menu
▾
▴
[Amis-vcs] SF.net SVN: amis: [2449] branches/amis3
|
From: <dan...@us...> - 2008-03-27 02:45:00
|
Revision: 2449
http://amis.svn.sourceforge.net/amis/?rev=2449&view=rev
Author: daniel_weck
Date: 2008-03-26 19:44:35 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
- fixed a few C++ compatibility bugs so that AMIS can compile with VS 2005
Modified Paths:
--------------
branches/amis3/AmisCore/include/io/BookListFileIO.h
branches/amis3/AmisCore/include/io/BookmarksFileIO.h
branches/amis3/AmisGuiMFC2/include/gui/sidebar/SizeCBar.h
branches/amis3/AmisGuiMFC2/include/gui/sidebar/cdxCDynamicControlsManager.h
branches/amis3/AmisGuiMFC2/include/gui/sidebar/scbarg.h
branches/amis3/AmisGuiMFC2/include/io/PreferencesFileIO.h
branches/amis3/AmisGuiMFC2/src/Preferences.cpp
branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp
branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/directshow/dx_audio_player.cpp
branches/amis3/AmisGuiMFC2/src/gui/sidebar/SizeCBar.cpp
branches/amis3/AmisGuiMFC2/src/gui/sidebar/scbarg.cpp
branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp
branches/amis3/AmisGuiMFC2/src/util/VolMaster.cpp
Modified: branches/amis3/AmisCore/include/io/BookListFileIO.h
===================================================================
--- branches/amis3/AmisCore/include/io/BookListFileIO.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisCore/include/io/BookListFileIO.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -71,7 +71,7 @@
amis::BookList* mpBookList;
amis::BookEntry* mpCurrentEntry;
//The DOM document pointer
- xercesc_2_7::DOMDocument* mpDoc;
+ xercesc_2_8::DOMDocument* mpDoc;
};
}
}
Modified: branches/amis3/AmisCore/include/io/BookmarksFileIO.h
===================================================================
--- branches/amis3/AmisCore/include/io/BookmarksFileIO.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisCore/include/io/BookmarksFileIO.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -80,7 +80,7 @@
vector<string> mElementStack;
//The DOM document pointer (for saving the file)
- xercesc_2_7::DOMDocument* mpDoc;
+ xercesc_2_8::DOMDocument* mpDoc;
//the title element
amis::MediaGroup* mpTitle;
Modified: branches/amis3/AmisGuiMFC2/include/gui/sidebar/SizeCBar.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/sidebar/SizeCBar.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/include/gui/sidebar/SizeCBar.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -169,7 +169,12 @@
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
afx_msg void OnNcPaint();
afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);
+
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
afx_msg UINT OnNcHitTest(CPoint point);
+#else // Later than VS.NET 2003
+ afx_msg LRESULT OnNcHitTest(CPoint point);
+#endif
afx_msg void OnCaptureChanged(CWnd *pWnd);
afx_msg void OnSettingChange(UINT uFlags, LPCTSTR lpszSection);
afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
Modified: branches/amis3/AmisGuiMFC2/include/gui/sidebar/cdxCDynamicControlsManager.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/sidebar/cdxCDynamicControlsManager.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/include/gui/sidebar/cdxCDynamicControlsManager.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -193,7 +193,7 @@
// (used by Add())
// Note that the window is not need to be already created
//
- private:
+ public:
struct ControlEntry
{
private:
Modified: branches/amis3/AmisGuiMFC2/include/gui/sidebar/scbarg.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/sidebar/scbarg.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/include/gui/sidebar/scbarg.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -107,7 +107,11 @@
// Generated message map functions
protected:
//{{AFX_MSG(CSizingControlBarG)
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
afx_msg UINT OnNcHitTest(CPoint point);
+#else // Later than VS.NET 2003
+ afx_msg LRESULT OnNcHitTest(CPoint point);
+#endif
afx_msg void OnNcLButtonUp(UINT nHitTest, CPoint point);
//}}AFX_MSG
Modified: branches/amis3/AmisGuiMFC2/include/io/PreferencesFileIO.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/io/PreferencesFileIO.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/include/io/PreferencesFileIO.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -66,7 +66,7 @@
void addEntry(std::string, std::string);
amis::Preferences* mpPrefs;
- xercesc_2_7::DOMDocument* mpDoc;
+ xercesc_2_8::DOMDocument* mpDoc;
};
}
}
Modified: branches/amis3/AmisGuiMFC2/src/Preferences.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/Preferences.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/Preferences.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -363,10 +363,10 @@
}
amis::ModuleDescData* Preferences::getCurrentLanguageData()
-{
- amis::ModuleDescData* p_data = mInstalledLanguages[mUiLangId];
- return p_data;
-}
+{
+ amis::ModuleDescData* p_data = mInstalledLanguages[mUiLangId];
+ return p_data;
+}
void Preferences::setHighlightBGColor(amis::util::Color value)
{
mHighlightBG = value;
@@ -390,9 +390,9 @@
std::string Preferences::getSidebarFontName()
{
return mSidebarFontName;
-}
-void Preferences::logAllPreferences()
-{
+}
+void Preferences::logAllPreferences()
+{
amis::util::Log* p_log = amis::util::Log::Instance();
p_log->writeMessage("__Preferences (all)__");
@@ -467,18 +467,18 @@
p_log->writeMessage("\tCustom CSS files:");
- for (i = 0; i<mCustomCssFiles.size(); i++)
- p_log->writeMessage("\t\t", &mCustomCssFiles[i]);
-}
-
-void Preferences::logUserControllablePreferences()
-{
+ for (int i = 0; i<mCustomCssFiles.size(); i++)
+ p_log->writeMessage("\t\t", &mCustomCssFiles[i]);
+}
+
+void Preferences::logUserControllablePreferences()
+{
amis::util::Log* p_log = amis::util::Log::Instance();
- p_log->writeMessage("__Preferences (user-controllable only)__");
-
+ p_log->writeMessage("__Preferences (user-controllable only)__");
+
string log_msg = "\tLanguage pack = " + getUiLangId();
- p_log->writeMessage(log_msg);
-
+ p_log->writeMessage(log_msg);
+
log_msg = "\tStartup view = ";
if (getStartInBasicView()) log_msg += "Basic";
else log_msg += "Default";
@@ -497,8 +497,8 @@
log_msg = "\tIs self-voicing? ";
if (getIsSelfVoicing()) log_msg += "Yes";
else log_msg += "No";
- p_log->writeMessage(log_msg);
-
+ p_log->writeMessage(log_msg);
+
log_msg = "\tHighlight text? ";
if (getHighlightText()) log_msg += "Yes";
else log_msg += "No";
@@ -507,5 +507,5 @@
log_msg = "\tDisable screensaver? ";
if (getDisableScreensaver()) log_msg += "Yes";
else log_msg += "No";
- p_log->writeMessage(log_msg);
+ p_log->writeMessage(log_msg);
}
\ No newline at end of file
Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -476,14 +476,14 @@
if (view->isPlaying() == true)
{
amis::util::Log::Instance()->writeMessage("Pausing", "CAmisApp::OnPlayPause", "AmisGuiMFC2");
- MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(true);
+ MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(true);
MainWndParts::Instance()->mpBasicToolbar->togglePlayPause(true);
view->OnFilePause();
}
else
{
amis::util::Log::Instance()->writeMessage("Playing", "CAmisApp::OnPlayPause", "AmisGuiMFC2");
- MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(false);
+ MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(false);
MainWndParts::Instance()->mpBasicToolbar->togglePlayPause(false);
view->OnFilePlay();
}
@@ -569,57 +569,57 @@
}
void CAmisApp::OnVolumeUp()
-{
- amis::util::Log::Instance()->writeMessage("Volume increase", "CAmisApp::OnVolumeUp", "AmisGuiMFC2");
- //amis::audio::AmisAudio::Instance()->adjustVolume(1.2); REMOVED because it makes more sense to allow book volume control than the whole application: otherwise users would use their OS-level volume control.
+{
+ amis::util::Log::Instance()->writeMessage("Volume increase", "CAmisApp::OnVolumeUp", "AmisGuiMFC2");
+ //amis::audio::AmisAudio::Instance()->adjustVolume(1.2); REMOVED because it makes more sense to allow book volume control than the whole application: otherwise users would use their OS-level volume control.
ambulant::gui::dx::change_global_level(1.2);
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_VOLUP, true, NULL);
}
void CAmisApp::OnVolumeDown()
-{
- amis::util::Log::Instance()->writeMessage("Volume decrease", "CAmisApp::OnVolumeDown", "AmisGuiMFC2");
- //amis::audio::AmisAudio::Instance()->adjustVolume(1.0/1.2); REMOVED because it makes more sense to allow book volume control than the whole application: otherwise users would use their OS-level volume control.
+{
+ amis::util::Log::Instance()->writeMessage("Volume decrease", "CAmisApp::OnVolumeDown", "AmisGuiMFC2");
+ //amis::audio::AmisAudio::Instance()->adjustVolume(1.0/1.2); REMOVED because it makes more sense to allow book volume control than the whole application: otherwise users would use their OS-level volume control.
ambulant::gui::dx::change_global_level(1.0/1.2);
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_VOLDOWN, true, NULL);
}
void CAmisApp::OnSpeedUp()
-{
- amis::util::Log::Instance()->writeMessage("Speed increase", "CAmisApp::OnSpeedUp", "AmisGuiMFC2");
-
- long currentRate = amis::tts::TTSPlayer::Instance()->GetSpeechRate();
- amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate+1);
-
- double rate = ambulant::gui::dx::change_global_rate(0.7);
- ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
- updateSpeedButtons();
+{
+ amis::util::Log::Instance()->writeMessage("Speed increase", "CAmisApp::OnSpeedUp", "AmisGuiMFC2");
+
+ long currentRate = amis::tts::TTSPlayer::Instance()->GetSpeechRate();
+ amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate+1);
+
+ double rate = ambulant::gui::dx::change_global_rate(0.7);
+ ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
+ updateSpeedButtons();
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_FASTER, true, NULL);
}
void CAmisApp::OnSpeedDown()
-{
- amis::util::Log::Instance()->writeMessage("Speed decrease", "CAmisApp::OnSpeedDown", "AmisGuiMFC2");
-
- long currentRate = amis::tts::TTSPlayer::Instance()->GetSpeechRate();
- amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate-1);
-
- //TODO: Doesn't seem to affect the playback speed at all
- double rate = ambulant::gui::dx::change_global_rate(-0.7);
- ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
- updateSpeedButtons();
+{
+ amis::util::Log::Instance()->writeMessage("Speed decrease", "CAmisApp::OnSpeedDown", "AmisGuiMFC2");
+
+ long currentRate = amis::tts::TTSPlayer::Instance()->GetSpeechRate();
+ amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate-1);
+
+ //TODO: Doesn't seem to affect the playback speed at all
+ double rate = ambulant::gui::dx::change_global_rate(-0.7);
+ ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
+ updateSpeedButtons();
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_SLOWER, true, NULL);
}
void CAmisApp::OnSpeedNormal()
-{
- amis::util::Log::Instance()->writeMessage("Speed reset to normal", "CAmisApp::OnSpeedNormal", "AmisGuiMFC2");
-
- amis::tts::TTSPlayer::Instance()->SetSpeechRate(0);
-
- ambulant::gui::dx::set_global_rate(1.0);
- ambulantX::gui::dx::audio_playerX::Instance()->set_rate(1.0);
- updateSpeedButtons();
+{
+ amis::util::Log::Instance()->writeMessage("Speed reset to normal", "CAmisApp::OnSpeedNormal", "AmisGuiMFC2");
+
+ amis::tts::TTSPlayer::Instance()->SetSpeechRate(0);
+
+ ambulant::gui::dx::set_global_rate(1.0);
+ ambulantX::gui::dx::audio_playerX::Instance()->set_rate(1.0);
+ updateSpeedButtons();
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_NORMALSPEED, true, NULL);
}
@@ -735,12 +735,12 @@
{
amis::util::Log::Instance()->writeMessage("Loading from CD", "CAmisApp::OnLoadCd", "AmisGuiMFC2");
amis::util::SearchForFilesMFC searcher;
- //prepare the search tool
- searcher.clearAll();
- searcher.addSearchCriteria("ncc.htm");
- searcher.addSearchCriteria(".opf");
- //sometimes I see these temp files on my drive .. excluding them just to be safe
- searcher.addSearchExclusionCriteria("_ncc.html");
+ //prepare the search tool
+ searcher.clearAll();
+ searcher.addSearchCriteria("ncc.htm");
+ searcher.addSearchCriteria(".opf");
+ //sometimes I see these temp files on my drive .. excluding them just to be safe
+ searcher.addSearchExclusionCriteria("_ncc.html");
searcher.setRecursiveSearch(true);
int num_books = searcher.startSearchOnCdRom();
@@ -856,8 +856,8 @@
{
amis::gui::MenuManip::Instance()->setPauseState(pauseState);
MainWndParts::Instance()->updateTitlePlayState(!pauseState);
-
- MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(pauseState);
+
+ MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(pauseState);
MainWndParts::Instance()->mpBasicToolbar->togglePlayPause(pauseState);
}
@@ -918,11 +918,11 @@
}
void CAmisApp::updateFontSizeButtons()
-{
- bool can_increase = TextRenderBrain::Instance()->canIncreaseFontSize();
- bool can_decrease = TextRenderBrain::Instance()->canDecreaseFontSize();
- MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_BIGGER_FONT, can_increase);
- MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_BIGGER_FONT, can_increase);
+{
+ bool can_increase = TextRenderBrain::Instance()->canIncreaseFontSize();
+ bool can_decrease = TextRenderBrain::Instance()->canDecreaseFontSize();
+ MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_BIGGER_FONT, can_increase);
+ MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_BIGGER_FONT, can_increase);
MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_SMALLER_FONT, can_decrease);
MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_SMALLER_FONT, can_decrease);
}
@@ -930,9 +930,9 @@
void CAmisApp::updateSpeedButtons()
{
bool can_increase = canIncreasePlaybackSpeed();
- bool can_decrease = canDecreasePlaybackSpeed();
- MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_FASTER, can_increase);
- MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_FASTER, can_increase);
+ bool can_decrease = canDecreasePlaybackSpeed();
+ MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_FASTER, can_increase);
+ MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_FASTER, can_increase);
MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_SLOWER, can_decrease);
MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_SLOWER, can_decrease);
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -90,7 +90,7 @@
int max = AMIS_MAX_RECENT_BOOKS;
if (num_entries < max) max = num_entries;
//get the last X entries
- for (i=num_entries-1; i>=num_entries-max; i--)
+ for (int i=num_entries-1; i>=num_entries-max; i--)
{
p_entry = theApp.getHistory()->getEntry(i);
string filepath = p_entry->mPath.get_url();
Modified: branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -178,7 +178,7 @@
}
static dg_or_dx_player *player = 0;
-static needs_done_redraw = false;
+static bool needs_done_redraw = false;
CWnd* topView = NULL;
@@ -419,7 +419,7 @@
void MmView::OnFilePlay()
{
- /*DBG*/static in_here = 0;
+ /*DBG*/static int in_here = 0;
/*DBG*/assert(!in_here);
/*DBG*/in_here++;
if(player)
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -22,7 +22,7 @@
#include "Preferences.h"
#include "util/FilePathTools.h"
-
+
#include "util/xercesutils.h"
using namespace amis::gui::spoken;
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/directshow/dx_audio_player.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/directshow/dx_audio_player.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/directshow/dx_audio_player.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -30,7 +30,7 @@
//#include "ambulant/lib/logger.h"
//#include "ambulant/lib/textptr.h"
#include <math.h>
-#include <vfwmsgs.h>
+//#include <vfwmsgs.h>
// CLSID_FilterGraph
//#include <uuids.h>
#include <dshow.h>
Modified: branches/amis3/AmisGuiMFC2/src/gui/sidebar/SizeCBar.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/sidebar/SizeCBar.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/sidebar/SizeCBar.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -573,7 +573,11 @@
CPaintDC dc(this);
}
-UINT CSizingControlBar::OnNcHitTest(CPoint point)
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
+ UINT CSizingControlBar::OnNcHitTest(CPoint point)
+#else // Later than VS.NET 2003
+ LRESULT CSizingControlBar::OnNcHitTest(CPoint point)
+#endif
{
CRect rcBar, rcEdge;
GetWindowRect(rcBar);
@@ -1008,7 +1012,7 @@
}
// make all the bars the same width
- for (i = 0; i < nNumBars; i++)
+ for (int i = 0; i < nNumBars; i++)
if (bHorz)
arrSCBars[i]->m_szHorz.cy = nWidthMax;
else
@@ -1019,7 +1023,7 @@
while (nDelta != 0)
{
int nDeltaOld = nDelta;
- for (i = 0; i < nNumBars; i++)
+ for (int i = 0; i < nNumBars; i++)
{
pBar = arrSCBars[i];
int nLMin = bHorz ?
@@ -1039,7 +1043,7 @@
}
// clear m_bKeepSize flags
if ((nDeltaOld == nDelta) || (nDelta == 0))
- for (i = 0; i < nNumBars; i++)
+ for (int i = 0; i < nNumBars; i++)
arrSCBars[i]->m_bKeepSize = FALSE;
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/sidebar/scbarg.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/sidebar/scbarg.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/sidebar/scbarg.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -144,13 +144,20 @@
m_biHide.Paint(pDC);
}
-
-UINT CSizingControlBarG::OnNcHitTest(CPoint point)
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
+ UINT CSizingControlBarG::OnNcHitTest(CPoint point)
+#else // Later than VS.NET 2003
+ LRESULT CSizingControlBarG::OnNcHitTest(CPoint point)
+#endif
{
CRect rcBar;
GetWindowRect(rcBar);
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
UINT nRet = baseCSizingControlBarG::OnNcHitTest(point);
+#else // Later than VS.NET 2003
+ LRESULT nRet = baseCSizingControlBarG::OnNcHitTest(point);
+#endif
if (nRet != HTCLIENT)
return nRet;
Modified: branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -229,7 +229,7 @@
DOMImplementation* pImpl = NULL;
DOMWriter* pWriter = NULL;
- xercesc_2_7::DOMDocument* pDoc = NULL;
+ xercesc_2_8::DOMDocument* pDoc = NULL;
XMLFormatTarget* pFormTarget = NULL;
try
@@ -246,7 +246,7 @@
pDoc = pImpl->createDocument(
X("http://amisproject.org"),
X("preferences"),
- (xercesc_2_7::DOMDocumentType*)0);
+ (xercesc_2_8::DOMDocumentType*)0);
mpDoc = pDoc;
writeData();
Modified: branches/amis3/AmisGuiMFC2/src/util/VolMaster.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/util/VolMaster.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/util/VolMaster.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -14,7 +14,7 @@
//
int CVolumeMaster::GetLogicalDriveStrings(CStringArray& ar)
{
- const BUFLEN = 26*4;
+ const int BUFLEN = 26*4;
TCHAR buf[BUFLEN+1];
::GetLogicalDriveStrings(BUFLEN, buf);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
