Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7851/src/gui
Modified Files:
wxDialogLayout.cpp wxMDialogs.cpp wxSortDialog.cpp
Log Message:
fixes for deprecation warnings with wx 2.5
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -b -u -2 -r1.112 -r1.113
--- wxDialogLayout.cpp 27 Sep 2004 13:41:14 -0000 1.112
+++ wxDialogLayout.cpp 24 Jan 2005 18:36:20 -0000 1.113
@@ -140,5 +140,5 @@
{
wxClientDC dc(win);
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
long width, widthMax = 0;
@@ -273,5 +273,4 @@
wxString label = labelFull;
wxArrayString choices = SplitLabelWithChoices(&label);
- wxString *strings = choices.GetStringArray();
wxLayoutConstraints *c;
@@ -296,9 +295,7 @@
wxRadioBox *radiobox = new wxRadioBox(parent, -1, _T(""),
wxDefaultPosition, wxDefaultSize,
- choices.GetCount(), strings,
+ choices,
1, wxRA_SPECIFY_ROWS);
- delete [] strings;
-
radiobox->SetConstraints(c);
@@ -851,5 +848,4 @@
wxString label = labelFull;
wxArrayString choices = SplitLabelWithChoices(&label);
- wxString *strings = choices.GetStringArray();
wxLayoutConstraints *c;
@@ -879,5 +875,5 @@
combobox = new wxComboBox(GetCanvas(), -1, _T(""),
wxDefaultPosition, wxDefaultSize,
- choices.GetCount(), strings,
+ choices,
wxCB_DROPDOWN | wxCB_READONLY);
}
@@ -886,10 +882,9 @@
combobox = new wxChoice(GetCanvas(), -1,
wxDefaultPosition, wxDefaultSize,
- choices.GetCount(), strings);
+ choices);
}
combobox->SetConstraints(c);
- delete [] strings;
return combobox;
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.418
retrieving revision 1.419
diff -b -u -2 -r1.418 -r1.419
--- wxMDialogs.cpp 3 Oct 2004 16:28:45 -0000 1.418
+++ wxMDialogs.cpp 24 Jan 2005 18:36:20 -0000 1.419
@@ -472,5 +472,5 @@
long widthLabel, heightLabel;
wxClientDC dc(this);
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
dc.GetTextExtent(strPrompt, &widthLabel, &heightLabel);
@@ -3121,5 +3121,5 @@
#ifdef __WXMSW__
m_frame->SetBackgroundColour(wxSystemSettings::
- GetSystemColour(wxSYS_COLOUR_BTNFACE));
+ GetColour(wxSYS_COLOUR_BTNFACE));
m_frame->EnableCloseButton(FALSE);
Index: wxSortDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSortDialog.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -u -2 -r1.16 -r1.17
--- wxSortDialog.cpp 12 Oct 2003 13:14:48 -0000 1.16
+++ wxSortDialog.cpp 24 Jan 2005 18:36:22 -0000 1.17
@@ -124,5 +124,5 @@
wxClientDC dc(this);
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
long width, widthMax = 0;
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
