Revision: 7267
http://svn.sourceforge.net/mahogany/?rev=7267&view=rev
Author: vadz
Date: 2007-05-05 15:40:07 -0700 (Sat, 05 May 2007)
Log Message:
-----------
compilation fixes for using wxWidgets built without WXWIN_COMPATIBILITY_2_8
Modified Paths:
--------------
trunk/M/include/gui/wxllist.h
trunk/M/src/adb/AdbFrame.cpp
trunk/M/src/classes/CacheFile.cpp
trunk/M/src/classes/MessageTemplate.cpp
trunk/M/src/gui/wxComposeView.cpp
trunk/M/src/gui/wxDialogLayout.cpp
trunk/M/src/gui/wxMDialogs.cpp
trunk/M/src/gui/wxSortDialog.cpp
trunk/M/src/gui/wxllist.cpp
trunk/M/src/gui/wxlparser.cpp
trunk/M/src/mail/Address.cpp
trunk/M/src/mail/MFCache.cpp
trunk/M/src/mail/MailFolder.cpp
trunk/M/src/mail/Pop3.cpp
trunk/M/src/util/ColourNames.cpp
trunk/M/src/util/strutil.cpp
Modified: trunk/M/include/gui/wxllist.h
===================================================================
--- trunk/M/include/gui/wxllist.h 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/include/gui/wxllist.h 2007-05-05 22:40:07 UTC (rev 7267)
@@ -306,7 +306,7 @@
private:
wxString m_Text;
/// size of the box containing text
- long m_Width, m_Height;
+ wxCoord m_Width, m_Height;
/// Height above baseline.
long m_Top;
/// Height below baseline.
Modified: trunk/M/src/adb/AdbFrame.cpp
===================================================================
--- trunk/M/src/adb/AdbFrame.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/adb/AdbFrame.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -1577,7 +1577,7 @@
// first determine the longest button caption
wxClientDC dc(this);
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- long width, widthMax = 0;
+ wxCoord width, widthMax = 0;
for ( n = 0; n < nButtons; n++ ) {
dc.GetTextExtent(aButtons[n]->GetLabel(), &width, NULL);
if ( width > widthMax )
@@ -2774,7 +2774,7 @@
// ---------------------
const wxChar *label = _("Find &what:");
- long widthLabel, heightLabel;
+ wxCoord widthLabel, heightLabel;
wxClientDC dc(this);
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
dc.GetTextExtent(label, &widthLabel, &heightLabel);
@@ -2926,7 +2926,7 @@
const wxChar *label = _("&New entry/group name:");
// layout
- long widthLabel, heightLabel;
+ wxCoord widthLabel, heightLabel;
wxClientDC dc(this);
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
dc.GetTextExtent(label, &widthLabel, &heightLabel);
@@ -3034,7 +3034,7 @@
// first determine the longest label
wxClientDC dc(this);
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- long widthLabel, heightLabel = 0, widthLabelMax = 0;
+ wxCoord widthLabel, heightLabel = 0, widthLabelMax = 0;
for ( n = 0; n < WXSIZEOF(labels); n++ ) {
labelsT[n] = wxGetTranslation(labels[n]);
dc.GetTextExtent(labelsT[n], &widthLabel, &heightLabel);
@@ -3563,7 +3563,7 @@
size_t nBtn;
wxClientDC dc(this);
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- long width, widthMax = 0;
+ wxCoord width, widthMax = 0;
for ( nBtn = 0; nBtn < WXSIZEOF(aszLabels); nBtn++ ) {
aszLabelsT[nBtn] = wxGetTranslation(aszLabels[nBtn]);
dc.GetTextExtent(aszLabelsT[nBtn], &width, NULL);
@@ -3625,7 +3625,7 @@
// first determine the longest label
wxClientDC dc(this);
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- long width, widthMax = 0;
+ wxCoord width, widthMax = 0;
for ( n = 0; n < nCount; n++ ) {
// do it only for text control labels
switch ( fields[n].type ) {
Modified: trunk/M/src/classes/CacheFile.cpp
===================================================================
--- trunk/M/src/classes/CacheFile.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/classes/CacheFile.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -30,6 +30,7 @@
#include "MApplication.h"
#include <wx/log.h> // for wxLogNull
+ #include <wx/wxchar.h> // for wxPrintf/Scanf
#endif // USE_PCH
#include <wx/filefn.h> // for wxMkdir
Modified: trunk/M/src/classes/MessageTemplate.cpp
===================================================================
--- trunk/M/src/classes/MessageTemplate.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/classes/MessageTemplate.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -27,6 +27,7 @@
# include <wx/string.h> // for wxString
# include <wx/log.h> // for wxLogWarning
+# include <wx/wxchar.h> // for wxPrintf/Scanf
#endif // USE_PCH
#include <wx/textfile.h> // for wxTextFileType_Unix
Modified: trunk/M/src/gui/wxComposeView.cpp
===================================================================
--- trunk/M/src/gui/wxComposeView.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/gui/wxComposeView.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -46,6 +46,7 @@
# include <wx/filedlg.h>
# include <wx/stattext.h>
# include <wx/dataobj.h>
+# include <wx/wxchar.h> // for wxPrintf/Scanf
#endif // USE_PCH
#ifdef __CYGWIN__
Modified: trunk/M/src/gui/wxDialogLayout.cpp
===================================================================
--- trunk/M/src/gui/wxDialogLayout.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/gui/wxDialogLayout.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -33,6 +33,7 @@
# include "gui/wxMFrame.h"
# include "gui/wxIconManager.h"
+# include <wx/wxchar.h> // for wxPrintf/Scanf
# include <wx/layout.h>
# include <wx/stattext.h>
# include <wx/statbox.h>
@@ -149,7 +150,7 @@
{
wxClientDC dc(win);
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- long width, widthMax = 0;
+ wxCoord width, widthMax = 0;
size_t nCount = labels.Count();
for ( size_t n = 0; n < nCount; n++ )
Modified: trunk/M/src/gui/wxMDialogs.cpp
===================================================================
--- trunk/M/src/gui/wxMDialogs.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/gui/wxMDialogs.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -394,7 +394,7 @@
}
// layout
- long widthLabel, heightLabel;
+ wxCoord widthLabel, heightLabel;
wxClientDC dc(this);
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
dc.GetTextExtent(strPrompt, &widthLabel, &heightLabel);
Modified: trunk/M/src/gui/wxSortDialog.cpp
===================================================================
--- trunk/M/src/gui/wxSortDialog.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/gui/wxSortDialog.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -123,7 +123,7 @@
wxClientDC dc(this);
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- long width, widthMax = 0;
+ wxCoord width, widthMax = 0;
// see the comment near sortCriteria definition
ASSERT_MSG( NUM_CRITERIA < 16, _T("too many sort criteria") );
Modified: trunk/M/src/gui/wxllist.cpp
===================================================================
--- trunk/M/src/gui/wxllist.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/gui/wxllist.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -44,6 +44,7 @@
# include "Mcommon.h"
# endif
+# include <wx/wxchar.h> // for wxPrintf/Scanf
# include <wx/dc.h>
# include <wx/dcps.h>
# include <wx/print.h>
@@ -296,7 +297,7 @@
CoordType
xpos = coords.x,
ypos = coords.y-m_Top;
- long width, height, descent;
+ wxCoord width, height, descent;
if(begin < 0) begin = 0;
if( end > (signed)m_Text.Length() )
@@ -323,7 +324,7 @@
CoordType
offs = 1,
maxlen = m_Text.Length();
- long
+ wxCoord
width = 0,
height, descent = 0l;
@@ -347,7 +348,7 @@
void
wxLayoutObjectText::Layout(wxDC &dc, class wxLayoutList * /* llist */)
{
- long descent = 0l;
+ wxCoord descent = 0l;
// now this is done in wxLayoutLine::Layout(), but this code might be
// reenabled later - in principle, it's more efficient
@@ -1243,7 +1244,7 @@
if(obj->GetType() == WXLO_TYPE_TEXT)
{
len = cx - count; // pos in object
- CoordType width, height, descent;
+ wxCoord width, height, descent;
dc.GetTextExtent((*(wxLayoutObjectText*)*i).GetText().substr(0,len),
&width, &height, &descent);
cursorPos->x += width;
@@ -1324,7 +1325,7 @@
if(m_Height == 0)
{
- CoordType width, height, descent;
+ wxCoord width, height, descent;
dc.GetTextExtent(WXLO_CURSORCHAR, &width, &height, &descent);
m_Height = height;
m_BaseLine = m_Height - descent;
@@ -1343,7 +1344,7 @@
// line or on a command object:
if(cursorSize->x < WXLO_MINIMUM_CURSOR_WIDTH)
{
- CoordType width, height, descent;
+ wxCoord width, height, descent;
dc.GetTextExtent(WXLO_CURSORCHAR, &width, &height, &descent);
cursorSize->x = width;
cursorSize->y = height;
Modified: trunk/M/src/gui/wxlparser.cpp
===================================================================
--- trunk/M/src/gui/wxlparser.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/gui/wxlparser.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -20,6 +20,8 @@
#ifndef USE_PCH
# include "Mcommon.h"
+
+# include <wx/wxchar.h> // for wxPrintf/Scanf
#endif // USE_PCH
#include "gui/wxllist.h"
Modified: trunk/M/src/mail/Address.cpp
===================================================================
--- trunk/M/src/mail/Address.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/mail/Address.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -29,6 +29,7 @@
#include "strutil.h"
#include "Mdefaults.h"
+ #include "MApplication.h"
#endif // USE_PCH
#include <wx/hashmap.h>
Modified: trunk/M/src/mail/MFCache.cpp
===================================================================
--- trunk/M/src/mail/MFCache.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/mail/MFCache.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -26,6 +26,8 @@
#ifndef USE_PCH
#include "Mcommon.h"
+
+ #include <wx/wxchar.h>
#endif // USE_PCH
#include <wx/textfile.h>
Modified: trunk/M/src/mail/MailFolder.cpp
===================================================================
--- trunk/M/src/mail/MailFolder.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/mail/MailFolder.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -32,6 +32,7 @@
# include "strutil.h"
# include "Mdefaults.h"
+# include <wx/wxchar.h> // for wxPrintf/Scanf
# include <wx/frame.h> // for wxFrame
#endif // USE_PCH
Modified: trunk/M/src/mail/Pop3.cpp
===================================================================
--- trunk/M/src/mail/Pop3.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/mail/Pop3.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -24,6 +24,8 @@
# include "Mcommon.h"
# include "Mcclient.h"
+
+# include <wx/wxchar.h> // for wxPrintf/Scanf
#endif // USE_PCH
extern "C"
Modified: trunk/M/src/util/ColourNames.cpp
===================================================================
--- trunk/M/src/util/ColourNames.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/util/ColourNames.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -16,6 +16,7 @@
# include "Mcommon.h"
# include "Mdefaults.h"
+# include <wx/wxchar.h> // for wxPrintf/Scanf
# include "wx/colour.h"
# include "wx/gdicmn.h"
#endif // USE_PCH
Modified: trunk/M/src/util/strutil.cpp
===================================================================
--- trunk/M/src/util/strutil.cpp 2007-05-05 22:23:16 UTC (rev 7266)
+++ trunk/M/src/util/strutil.cpp 2007-05-05 22:40:07 UTC (rev 7267)
@@ -25,6 +25,7 @@
# include "MApplication.h"
# include "Mcclient.h"
# include "Mdefaults.h"
+# include <wx/wxchar.h> // for wxPrintf/Scanf
#endif // USE_PCH
#include "gui/wxMDialogs.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.