Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21844/src/gui
Modified Files:
wxBrowseButton.cpp wxComposeView.cpp wxFolderTree.cpp
wxMFrame.cpp
Log Message:
fixed compilation with WXWIN_COMPATIBILITY_2_4 == 0
Index: wxBrowseButton.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxBrowseButton.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -b -u -2 -r1.40 -r1.41
--- wxBrowseButton.cpp 21 Jul 2004 12:26:22 -0000 1.40
+++ wxBrowseButton.cpp 24 Nov 2005 13:30:53 -0000 1.41
@@ -153,6 +153,5 @@
wxSplitPath(strPath, &strLastDir, &strLastFile, &strLastExt);
- long style = m_open ? wxOPEN | wxHIDE_READONLY
- : wxSAVE | wxOVERWRITE_PROMPT;
+ long style = m_open ? wxOPEN : wxSAVE | wxOVERWRITE_PROMPT;
if ( m_existingOnly )
style |= wxFILE_MUST_EXIST;
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.392
retrieving revision 1.393
diff -b -u -2 -r1.392 -r1.393
--- wxComposeView.cpp 16 Nov 2005 15:58:40 -0000 1.392
+++ wxComposeView.cpp 24 Nov 2005 13:30:53 -0000 1.393
@@ -3262,5 +3262,5 @@
NULL, _T("dead.letter"), NULL,
wxGetTranslation(wxALL_FILES),
- wxOPEN | wxHIDE_READONLY | wxFILE_MUST_EXIST,
+ wxOPEN | wxFILE_MUST_EXIST,
this
);
@@ -3348,5 +3348,5 @@
NULL, _T("dead.letter"), NULL,
wxGetTranslation(wxALL_FILES),
- wxOPEN | wxHIDE_READONLY | wxFILE_MUST_EXIST,
+ wxOPEN | wxFILE_MUST_EXIST,
this
);
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.236
retrieving revision 1.237
diff -b -u -2 -r1.236 -r1.237
--- wxFolderTree.cpp 27 Sep 2004 20:05:48 -0000 1.236
+++ wxFolderTree.cpp 24 Nov 2005 13:30:53 -0000 1.237
@@ -306,5 +306,5 @@
// accessors
- wxFolderTreeNode *GetSelection() const { return m_current; }
+ wxFolderTreeNode *GetSelectedNode() const { return m_current; }
// helpers
@@ -410,8 +410,8 @@
{
// is the root item chosen?
- if ( wxTreeCtrl::GetSelection() == GetRootItem() )
+ if ( GetSelection() == GetRootItem() )
return false;
- wxFolderTreeNode *node = GetSelection();
+ wxFolderTreeNode *node = GetSelectedNode();
CHECK( node, false, _T("shouldn't be called if no selection") );
@@ -821,5 +821,5 @@
CHECK( m_tree, NULL, _T("you didn't call Init()") );
- wxFolderTreeNode *node = m_tree->GetSelection();
+ wxFolderTreeNode *node = m_tree->GetSelectedNode();
if ( !node )
return NULL;
@@ -910,5 +910,5 @@
// get it from the tree
- wxFolderTreeNode *node = m_tree->GetSelection();
+ wxFolderTreeNode *node = m_tree->GetSelectedNode();
if ( node == NULL )
return NULL;
@@ -1349,5 +1349,5 @@
// add this item to the tree
- int id;
+ wxTreeItemId id;
if ( folder->GetType() == MF_ROOT )
{
@@ -1869,5 +1869,5 @@
{
// yes, visually emphasize it
- m_idOpenedHere = wxTreeCtrl::GetSelection();
+ m_idOpenedHere = GetSelection();
if ( READ_APPCONFIG(MP_FTREE_SHOWOPENED) )
{
@@ -1879,5 +1879,5 @@
void wxFolderTreeImpl::DoPopupMenu(const wxPoint& pos)
{
- wxFolderTreeNode *cur = GetSelection();
+ wxFolderTreeNode *cur = GetSelectedNode();
if ( cur != NULL )
{
@@ -2322,5 +2322,5 @@
{
// start from the beginning if no current node
- wxFolderTreeNode *node = GetSelection();
+ wxFolderTreeNode *node = GetSelectedNode();
wxTreeItemId id; // NB: gcc 2.91 dies if we use operator ?: here
if ( node )
@@ -2402,5 +2402,5 @@
// leave only the label itself, get rid of suffix showing the number of
// messages
- long item = event.GetItem();
+ wxTreeItemId item = event.GetItem();
wxFolderTreeNode *node = GetFolderTreeNode(item);
@@ -2906,5 +2906,5 @@
{
// show the menu for the currently selected item
- item = wxTreeCtrl::GetSelection();
+ item = GetSelection();
if ( !item.IsOk() )
{
Index: wxMFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFrame.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -b -u -2 -r1.175 -r1.176
--- wxMFrame.cpp 9 Jul 2005 20:43:54 -0000 1.175
+++ wxMFrame.cpp 24 Nov 2005 13:30:53 -0000 1.176
@@ -1069,5 +1069,6 @@
wxPrintDialog printerDialog(this, &printDialogData);
- printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
+ // FIXME: this doesn't exist any more in wx 2.6, we need another way to do
it
+ //printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
if ( printerDialog.ShowModal() == wxID_OK )
{
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
