Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv7872/src/gui
Modified Files:
wxBrowseButton.cpp wxComposeView.cpp wxFiltersDialog.cpp
wxMApp.cpp wxMDialogs.cpp wxMFolderDialogs.cpp wxMFrame.cpp
wxMsgCmdProc.cpp wxllist.cpp wxlwindow.cpp
Log Message:
compilation fixes for wxCocoa (no wxUSE_TOOLTIPS nor wxUSE_PRINTING_ARCHITECTURE)
Index: wxBrowseButton.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxBrowseButton.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -b -u -2 -r1.37 -r1.38
--- wxBrowseButton.cpp 11 Oct 2003 23:13:46 -0000 1.37
+++ wxBrowseButton.cpp 10 Jan 2004 18:49:23 -0000 1.38
@@ -214,5 +214,7 @@
msg.Printf(_("Browse for a %s"), IsBrowsingForFiles() ? _("file")
: _("directory"));
+#if wxUSE_TOOLTIPS
SetToolTip(msg);
+#endif // wxUSE_TOOLTIPS
}
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.357
retrieving revision 1.358
diff -b -u -2 -r1.357 -r1.358
--- wxComposeView.cpp 2 Nov 2003 11:12:01 -0000 1.357
+++ wxComposeView.cpp 10 Jan 2004 18:49:23 -0000 1.358
@@ -571,5 +571,7 @@
m_rcptControl = rcptControl;
+#if wxUSE_TOOLTIPS
SetToolTip(_("Create a new recipient entry"));
+#endif // wxUSE_TOOLTIPS
}
@@ -603,5 +605,7 @@
m_rcptControl = rcptControl;
+#if wxUSE_TOOLTIPS
SetToolTip(_("Delete this address from the message recipients list"));
+#endif // wxUSE_TOOLTIPS
}
@@ -974,5 +978,7 @@
case Composer::Recipient_Bcc:
m_btnExpand->Enable();
+#if wxUSE_TOOLTIPS
m_btnExpand->SetToolTip(_("Expand the address using address books"));
+#endif // wxUSE_TOOLTIPS
break;
@@ -985,5 +991,7 @@
// browse for folder now
m_btnExpand->Enable();
+#if wxUSE_TOOLTIPS
m_btnExpand->SetToolTip(_("Browse for folder"));
+#endif // wxUSE_TOOLTIPS
break;
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -b -u -2 -r1.114 -r1.115
--- wxFiltersDialog.cpp 21 Dec 2003 00:35:48 -0000 1.114
+++ wxFiltersDialog.cpp 10 Jan 2004 18:49:23 -0000 1.115
@@ -1148,6 +1148,8 @@
m_ButtonMore = new wxButton(canvas, Button_MoreTests, _("&More"));
m_ButtonLess = new wxButton(canvas, Button_LessTests, _("&Fewer"));
+#if wxUSE_TOOLTIPS
m_ButtonMore->SetToolTip(_("Add another condition"));
m_ButtonLess->SetToolTip(_("Remove the last condition"));
+#endif // wxUSE_TOOLTIPS
SetDefaultSize(8*wBtn, 18*hBtn);
Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.282
retrieving revision 1.283
diff -b -u -2 -r1.282 -r1.283
--- wxMApp.cpp 6 Jan 2004 15:01:23 -0000 1.282
+++ wxMApp.cpp 10 Jan 2004 18:49:23 -0000 1.283
@@ -1203,4 +1203,5 @@
void wxMApp::CleanUpPrintData()
{
+#if wxUSE_PRINTING_ARCHITECTURE
// save our preferred printer settings
if ( m_PrintData )
@@ -1236,8 +1237,10 @@
m_PageSetupData = NULL;
}
+#endif // wxUSE_PRINTING_ARCHITECTURE
}
const wxPrintData *wxMApp::GetPrintData()
{
+#if wxUSE_PRINTING_ARCHITECTURE
if ( !m_PrintData )
{
@@ -1281,4 +1284,5 @@
#endif // wxUSE_POSTSCRIPT
}
+#endif // wxUSE_PRINTING_ARCHITECTURE
return m_PrintData;
@@ -1287,11 +1291,14 @@
void wxMApp::SetPrintData(const wxPrintData& printData)
{
+#if wxUSE_PRINTING_ARCHITECTURE
CHECK_RET( m_PrintData, _T("must have called GetPrintData() before!") );
*m_PrintData = printData;
+#endif // wxUSE_PRINTING_ARCHITECTURE
}
wxPageSetupDialogData *wxMApp::GetPageSetupData()
{
+#if wxUSE_PRINTING_ARCHITECTURE
if ( !m_PageSetupData )
{
@@ -1307,4 +1314,5 @@
#endif // wxUSE_POSTSCRIPT
}
+#endif // wxUSE_PRINTING_ARCHITECTURE
return m_PageSetupData;
@@ -1313,7 +1321,9 @@
void wxMApp::SetPageSetupData(const wxPageSetupDialogData& data)
{
+#if wxUSE_PRINTING_ARCHITECTURE
CHECK_RET( m_PrintData, _T("must have called GetPageSetupData() before!") );
*m_PageSetupData = data;
+#endif // wxUSE_PRINTING_ARCHITECTURE
}
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.410
retrieving revision 1.411
diff -b -u -2 -r1.410 -r1.411
--- wxMDialogs.cpp 28 Dec 2003 22:40:05 -0000 1.410
+++ wxMDialogs.cpp 10 Jan 2004 18:49:23 -0000 1.411
@@ -3075,5 +3075,7 @@
combo->SetStringSelection(identity);
+#if wxUSE_TOOLTIPS
combo->SetToolTip(_("Change the identity"));
+#endif // wxUSE_TOOLTIPS
return combo;
@@ -3097,5 +3099,12 @@
parent = mApplication->TopLevelFrame();
- m_frame = new wxMiniFrame
+ m_frame = new
+#ifdef __WXCOCOA__
+ // FIXME: no wxMiniFrame in wxCocoa yet but wxUSE_MINIFRAME
+ // is still set to 1
+ wxFrame
+#else
+ wxMiniFrame
+#endif
(
parent,
Index: wxMFolderDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFolderDialogs.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -b -u -2 -r1.187 -r1.188
--- wxMFolderDialogs.cpp 4 Jan 2004 01:39:04 -0000 1.187
+++ wxMFolderDialogs.cpp 10 Jan 2004 18:49:23 -0000 1.188
@@ -1115,4 +1115,5 @@
m_folderSubtype = CreateChoice(labels[Label_FolderSubtype], widthMax, m_isGroup);
+#if wxUSE_TOOLTIPS
// the checkboxes might not be very clear, so add some explanations in the
// form of tooltips
@@ -1130,4 +1131,5 @@
m_acceptUnsignedSSL->SetToolTip(_("Accept unsigned (self-signed) SSL
certificates?"));
#endif // USE_SSL
+#endif // wxUSE_PRINTING_ARCHITECTURE
wxFolderBaseDialog *dlgParent = GET_PARENT_OF_CLASS(this, wxFolderBaseDialog);
Index: wxMFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFrame.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -b -u -2 -r1.167 -r1.168
--- wxMFrame.cpp 2 Jan 2004 22:53:02 -0000 1.167
+++ wxMFrame.cpp 10 Jan 2004 18:49:23 -0000 1.168
@@ -1093,4 +1093,5 @@
wxMFrame::OnPrintSetup()
{
+#if wxUSE_PRINTING_ARCHITECTURE
wxPrintDialogData printDialogData(*mApplication->GetPrintData());
wxPrintDialog printerDialog(this, &printDialogData);
@@ -1102,8 +1103,10 @@
printerDialog.GetPrintDialogData().GetPrintData());
}
+#endif // wxUSE_PRINTING_ARCHITECTURE
}
void wxMFrame::OnPageSetup()
{
+#if wxUSE_PRINTING_ARCHITECTURE
wxPageSetupDialog pageSetupDialog(this, mApplication->GetPageSetupData());
if ( pageSetupDialog.ShowModal() == wxID_OK )
@@ -1113,4 +1116,5 @@
mApplication->SetPageSetupData(pageData);
}
+#endif // wxUSE_PRINTING_ARCHITECTURE
}
@@ -1119,4 +1123,5 @@
void wxMFrame::OnPrintSetupPS()
{
+#if wxUSE_PRINTING_ARCHITECTURE
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
@@ -1130,4 +1135,5 @@
= printerDialog.GetPrintDialogData().GetPrintData();
}
+#endif // wxUSE_PRINTING_ARCHITECTURE
}
@@ -1161,44 +1167,3 @@
#endif
}
-
-
-#if 0
-// unused so far:
-
-
-void wxMFrame::OnPageSetup()
-{
-#ifdef OS_WIN
- wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
-#else
- wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
-#endif
- wxPrintData &data = ((wxMApp *)mApplication)->GetPrintData();
- //FIXME data.SetOrientation(orientation);
-
-#ifdef OS_WIN
- wxPageSetupDialog pageSetupDialog(this, & data);
-#else
- wxGenericPageSetupDialog pageSetupDialog(this, & data);
-#endif
- if ( pageSetupDialog.ShowModal() == wxID_OK )
- {
- data = pageSetupDialog.GetPageSetupData();
- //FIXME orientation = data.GetOrientation();
- }
-}
-
-void wxMFrame::OnPageSetupPS()
-{
- wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
-
- wxPrintData &data = ((wxMApp *)mApplication)->GetPrintData();
- //data.SetOrientation(orientation);
-
- wxGenericPageSetupDialog pageSetupDialog(this, & data);
- (void)pageSetupDialog.ShowModal();
-
- //FIXME orientation = pageSetupDialog.GetPageSetupData().GetOrientation();
-}
-#endif
Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -b -u -2 -r1.52 -r1.53
--- wxMsgCmdProc.cpp 12 Oct 2003 13:14:48 -0000 1.52
+++ wxMsgCmdProc.cpp 10 Jan 2004 18:49:23 -0000 1.53
@@ -1449,7 +1449,7 @@
CHECK( m_winForDnd, false, _T("this msg view doesn't support dnd") );
-#if wxUSE_DRAG_AND_DROP
bool didDrop = false;
+#if wxUSE_DRAG_AND_DROP
MailFolder_obj mf(GetMailFolder());
CHECK( mf, false, _T("no mail folder to drag messages from?") );
@@ -1543,8 +1543,8 @@
m_UIdsCopiedOk.Empty();
}
+#endif // wxUSE_DRAG_AND_DROP
// did we do anything?
return didDrop;
-#endif // wxUSE_DRAG_AND_DROP
}
Index: wxllist.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxllist.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -b -u -2 -r1.159 -r1.160
--- wxllist.cpp 22 Dec 2003 23:04:15 -0000 1.159
+++ wxllist.cpp 10 Jan 2004 18:49:23 -0000 1.160
@@ -3216,4 +3216,6 @@
extern const MOption MP_PRINT_PREVIEWZOOM;
+#if wxUSE_PRINTING_ARCHITECTURE
+
// ----------------------------------------------------------------------------
// wxMVPreview: tiny helper class used by wxLayoutPrintout::PrintPreview() to
@@ -3274,4 +3276,5 @@
bool wxLayoutPrintout::PrintPreview(wxLayoutList *llist)
{
+#if wxUSE_PRINTING_ARCHITECTURE
// Pass two printout objects: for preview, and possible printing.
wxPrintDialogData pdd(*mApplication->GetPrintData());
@@ -3306,8 +3309,16 @@
return true;
+#else // !wxUSE_PRINTING_ARCHITECTURE
+ return false;
+#endif // wxUSE_PRINTING_ARCHITECTURE/!wxUSE_PRINTING_ARCHITECTURE
}
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
#endif // M_BASEDIR
+
+#if wxUSE_PRINTING_ARCHITECTURE
+
wxLayoutPrintout::wxLayoutPrintout(wxLayoutList *llist,
wxString const & title)
@@ -3462,4 +3473,7 @@
}
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
+
wxFont
wxFontCache::GetFont(int family, int size, int style, int weight,
@@ -3520,2 +3534,3 @@
}
#endif // 0
+
Index: wxlwindow.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxlwindow.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -b -u -2 -r1.141 -r1.142
--- wxlwindow.cpp 11 Oct 2003 23:13:47 -0000 1.141
+++ wxlwindow.cpp 10 Jan 2004 18:49:23 -0000 1.142
@@ -33,4 +33,11 @@
# include "gui/wxMApp.h"
# endif // USE_PCH
+
+# include <wx/menu.h>
+# include <wx/statusbr.h>
+# include <wx/textctrl.h>
+# include <wx/dcmemory.h>
+# include <wx/dcclient.h>
+
# include "gui/wxlwindow.h"
# include "gui/wxlparser.h"
@@ -48,9 +55,5 @@
#include <wx/clipbrd.h>
-#include <wx/textctrl.h>
#include <wx/dataobj.h>
-#include <wx/menu.h>
-#include <wx/statusbr.h>
-#include <wx/dcmemory.h>
#ifdef WXLAYOUT_USE_CARET
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
