Revert "update for wx 3.1.0 compatiblity - all changes are either wxCHECK_VERSION(3.0.0) wrapped or safe with wx 2.8 - wx 3.1"

This reverts commit 476a1f62c37a3aab19275230aa5a7806633fb705.
2025-07-05 23:19:06 +02:00 · 2015-04-12 07:07:50 -06:00 · 2015-04-12 07:07:50 -06:00 · 066e583883
commit 066e583883
parent 321d1b8f48
12 changed files with 27 additions and 170 deletions
--- a/src/LabelDialog.cpp
+++ b/src/LabelDialog.cpp
@ -72,11 +72,7 @@ enum {

 BEGIN_EVENT_TABLE(LabelDialog, wxDialog)
   EVT_GRID_SELECT_CELL(LabelDialog::OnSelectCell)
-#if wxCHECK_VERSION(3,0,0)
-   EVT_GRID_CELL_CHANGED(LabelDialog::OnCellChange)
-#else
   EVT_GRID_CELL_CHANGE(LabelDialog::OnCellChange)
-#endif
   EVT_BUTTON(ID_INSERTA, LabelDialog::OnInsert)
   EVT_BUTTON(ID_INSERTB, LabelDialog::OnInsert)
   EVT_BUTTON(ID_REMOVE,  LabelDialog::OnRemove)
@ -442,7 +438,7 @@ void LabelDialog::OnInsert(wxCommandEvent &event)

   // Attempt to guess which track the label should reside on
   if (cnt > 0) {
-      row = mGrid->GetGridCursorRow();
+      row = mGrid->GetCursorRow();
      if (row > 0 && row >= cnt) {
         index = mTrackNames.Index(mGrid->GetCellValue(row - 1, Col_Track));
      }
@ -474,8 +470,8 @@ void LabelDialog::OnInsert(wxCommandEvent &event)

 void LabelDialog::OnRemove(wxCommandEvent & WXUNUSED(event))
 {
-   int row = mGrid->GetGridCursorRow();
-   int col = mGrid->GetGridCursorCol();
+   int row = mGrid->GetCursorRow();
+   int col = mGrid->GetCursorColumn();
   int cnt = mData.GetCount();

   // Don't try to remove if no labels exist
--- a/src/NoteTrack.cpp
+++ b/src/NoteTrack.cpp
@ -318,8 +318,8 @@ int NoteTrack::DrawLabelControls(wxDC & dc, wxRect & r)
         }

         wxString t;
-         wxCoord w;
-         wxCoord h;
+         long w;
+         long h;

         t.Printf(wxT("%d"), chanName);
         dc.GetTextExtent(t, &w, &h);
--- a/src/Project.cpp
+++ b/src/Project.cpp
@ -1688,7 +1688,7 @@ void AudacityProject::OnIconize(wxIconizeEvent &event)
   // why but it does no harm.
   // Should we be returning true/false rather than
   // void return?  I don't know.
-   mIconized = event.IsIconized();
+   mIconized = event.Iconized();

   unsigned int i;

--- a/src/Tags.cpp
+++ b/src/Tags.cpp
@ -636,11 +636,7 @@ enum {
 };

 BEGIN_EVENT_TABLE(TagsEditor, wxDialog)
-#if wxCHECK_VERSION(3,0,0)
-   EVT_GRID_CELL_CHANGED(TagsEditor::OnChange)
-#else
   EVT_GRID_CELL_CHANGE(TagsEditor::OnChange)
-#endif
   EVT_BUTTON(EditID, TagsEditor::OnEdit)
   EVT_BUTTON(ResetID, TagsEditor::OnReset)
   EVT_BUTTON(ClearID, TagsEditor::OnClear)
@ -1220,7 +1216,7 @@ void TagsEditor::OnAdd(wxCommandEvent & WXUNUSED(event))

 void TagsEditor::OnRemove(wxCommandEvent & WXUNUSED(event))
 {
-   size_t row = mGrid->GetGridCursorRow();
+   size_t row = mGrid->GetCursorRow();

   if (!mEditTitle && mGrid->GetCellValue(row, 0).CmpNoCase(LABEL_TITLE) == 0) {
      return;
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@ -610,7 +610,7 @@ void TrackArtist::DrawVRuler(Track *t, wxDC * dc, wxRect & r)
            // ISO standard: A440 is in the 4th octave, denoted
            // A4 <- the "4" should be a subscript.
            s.Printf(wxT("C%d"), octave - 1);
-            wxCoord width, height;
+            long width, height;
            dc->GetTextExtent(s, &width, &height);
            if (obottom - height + 4 > r.y &&
                obottom + 4 < r.y + r.height) {
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@ -9517,7 +9517,7 @@ void TrackInfo::DrawTitleBar(wxDC * dc, const wxRect r, Track * t,
   wxString titleStr = t->GetName();
   int allowableWidth = kTrackInfoWidth - 38 - kLeftInset;

-   wxCoord textWidth, textHeight;
+   long textWidth, textHeight;
   dc->GetTextExtent(titleStr, &textWidth, &textHeight);
   while (textWidth > allowableWidth) {
      titleStr = titleStr.Left(titleStr.Length() - 1);
@ -9583,7 +9583,7 @@ void TrackInfo::DrawMuteSolo(wxDC * dc, const wxRect r, Track * t,
   dc->SetPen( *wxTRANSPARENT_PEN );//No border!
   dc->DrawRectangle(bev);

-   wxCoord textWidth, textHeight;
+   long textWidth, textHeight;
   wxString str = (solo) ?
      /* i18n-hint: This is on a button that will silence this track.*/
      _("Solo") :
--- a/src/effects/NoiseReduction.cpp
+++ b/src/effects/NoiseReduction.cpp
@ -1464,7 +1464,7 @@ struct ControlInfo {
 	 wxString(wxTRANSLATE("Attac&k time (secs):")), wxString(wxTRANSLATE("Attack time")) },
   { &EffectNoiseReduction::Settings::mReleaseTime,
     0, 1.0, 100, wxT("%.2f"), false,
-	 wxString(wxTRANSLATE("R&elease time (secs):")), wxString(wxTRANSLATE("Release time")) },
+	 wxTRANSLATE("R&elease time (secs):"), wxString(wxTRANSLATE("Release time")) },
 #endif
   { &EffectNoiseReduction::Settings::mFreqSmoothingBands,
     0, 6, 6, wxT("%d"), true,
--- a/src/import/ImportPCM.cpp
+++ b/src/import/ImportPCM.cpp
@ -541,11 +541,7 @@ int PCMImportFileHandle::Import(TrackFactory *trackFactory,
            if((mInfo.format & SF_FORMAT_TYPEMASK) == SF_FORMAT_AIFF)
               len = wxUINT32_SWAP_ON_LE(len);

-#if wxCHECK_VERSION(3,0,0)
-			if (wxStricmp(id, "ID3 ") != 0) {  // must be case insensitive
-#else
            if (Stricmp(id, "ID3 ") != 0) {  // must be case insensitive
-#endif
               f.Seek(len + (len & 0x01), wxFromCurrent);
               continue;
            }
--- a/src/widgets/ErrorDialog.h
+++ b/src/widgets/ErrorDialog.h
@ -46,15 +46,11 @@ class HtmlTextHelpDialog : public BrowserFrame
 public:
   HtmlTextHelpDialog() : BrowserFrame()
   {
-#if !wxCHECK_VERSION(3,0,0)
      MakeModal( true );
-#endif
   }
   virtual ~HtmlTextHelpDialog()
   {
-#if !wxCHECK_VERSION(3,0,0)
      MakeModal( false );
-#endif
      // On Windows, for some odd reason, the Audacity window will be sent to
      // the back.  So, make sure that doesn't happen.
      GetParent()->Raise();
--- a/src/widgets/KeyView.cpp
+++ b/src/widgets/KeyView.cpp
@ -585,8 +585,8 @@ KeyView::RefreshBindings(const wxArrayString & names,
      int x, y;

      // Remove any menu code from the category and prefix
-      wxString cat = wxMenuItem::GetLabelText(categories[i]);
-      wxString pfx = wxMenuItem::GetLabelText(prefixes[i]);
+      wxString cat = wxMenuItem::GetLabelFromText(categories[i]);
+      wxString pfx = wxMenuItem::GetLabelFromText(prefixes[i]);

      // Append "Menu" this node is for a menu title
      if (cat != wxT("Command"))
@ -696,7 +696,7 @@ KeyView::RefreshBindings(const wxArrayString & names,
      else
      {
         // Strip any menu codes from label
-         node.label = wxMenuItem::GetLabelText(labels[i].BeforeFirst(wxT('\t')));
+         node.label = wxMenuItem::GetLabelFromText(labels[i].BeforeFirst(wxT('\t')));
      }

      // Fill in remaining info
@ -1229,11 +1229,7 @@ KeyView::OnSetFocus(wxFocusEvent & event)
   // will also refresh the visual (highlighted) state.
   if (GetSelection() != wxNOT_FOUND)
   {
-#if wxCHECK_VERSION(3,0,0)
-	   RefreshRow(GetSelection());
-#else
      RefreshLine(GetSelection());
-#endif
   }

 #if wxUSE_ACCESSIBILITY
@ -1254,11 +1250,7 @@ KeyView::OnKillFocus(wxFocusEvent & event)
   // Refresh the selected line to adjust visual highlighting.
   if (GetSelection() != wxNOT_FOUND)
   {
-#if wxCHECK_VERSION(3,0,0)
-	   RefreshRow(GetSelection());
-#else
      RefreshLine(GetSelection());
-#endif
   }
 }

@ -1333,11 +1325,7 @@ KeyView::OnKeyDown(wxKeyEvent & event)
            RefreshLines();

            // Reset the original top line
-#if wxCHECK_VERSION(3,0,0)
-			ScrollToRow(topline);
-#else
            ScrollToLine(topline);
-#endif

            // And make sure current line is still selected
            SelectNode(LineToIndex(line));
@ -1401,11 +1389,7 @@ KeyView::OnKeyDown(wxKeyEvent & event)
               RefreshLines();

               // Reset the original top line
-#if wxCHECK_VERSION(3,0,0)
-			   ScrollToRow(topline);
-#else
               ScrollToLine(topline);
-#endif

               // And make sure current line is still selected
               SelectNode(LineToIndex(line));
@ -1547,11 +1531,7 @@ KeyView::OnLeftDown(wxMouseEvent & event)
         RefreshLines();

         // Reset the original top line
-#if wxCHECK_VERSION(3,0,0)
-		 ScrollToRow(topline);
-#else
         ScrollToLine(topline);
-#endif

         // And make sure current line is still selected
         SelectNode(LineToIndex(line));
@ -1777,11 +1757,7 @@ KeyView::GetLineHeight(int line)
      return 0;
   }

-#if wxCHECK_VERSION(3,0,0)
-   return OnGetRowHeight(line);
-#else
   return OnGetLineHeight(line);
-#endif
 }

 //
@ -1916,7 +1892,7 @@ KeyViewAx::IdToLine(int childId, int & line)
   line = childId - 1;

   // Make sure id is valid
-   if (line < 0 || line >= (int) mView->GetItemCount())
+   if (line < 0 || line >= (int) mView->GetLineCount())
   {
      // Indicate the control itself in this case
      return false;
@ -1932,7 +1908,7 @@ bool
 KeyViewAx::LineToId(int line, int & childId)
 {
   // Make sure line is valid
-   if (line < 0 || line >= (int) mView->GetItemCount())
+   if (line < 0 || line >= (int) mView->GetLineCount())
   {
      // Indicate the control itself in this case
      childId = wxACC_SELF;
@ -1990,7 +1966,7 @@ KeyViewAx::GetChild(int childId, wxAccessible** child)
 wxAccStatus
 KeyViewAx::GetChildCount(int *childCount)
 {
-   *childCount = (int) mView->GetItemCount();
+   *childCount = (int) mView->GetLineCount();

   return wxACC_OK;
 }
--- a/src/widgets/ProgressDialog.cpp
+++ b/src/widgets/ProgressDialog.cpp
@ -1134,7 +1134,7 @@ ProgressDialog::ProgressDialog(const wxString & title, const wxString & message,

   wxClientDC dc(this);
   dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-   wxCoord widthText = 0;
+   long widthText = 0;
   dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
   ds.x = (wxCoord) wxMax(wxMax(3 * widthText / 2, 4 * ds.y / 3), 300);
   SetClientSize(ds);
--- a/win/audacity.sln
+++ b/win/audacity.sln
@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.31101.0
+VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audacity", "Projects\Audacity\Audacity.vcxproj", "{1D64095C-F936-4FCF-B609-56E9DDF941FA}"
 	ProjectSection(ProjectDependencies) = postProject
@ -61,8 +61,6 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
-		wx31-debug|Win32 = wx31-debug|Win32
-		wx31-release|Win32 = wx31-release|Win32
 		wx3-Debug|Win32 = wx3-Debug|Win32
 		wx3-Release|Win32 = wx3-Release|Win32
 	EndGlobalSection
@ -71,10 +69,6 @@ Global
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.Debug|Win32.Build.0 = Debug|Win32
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.Release|Win32.ActiveCfg = Release|Win32
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.Release|Win32.Build.0 = Release|Win32
-		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -83,10 +77,6 @@ Global
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Debug|Win32.Build.0 = Debug|Win32
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Release|Win32.ActiveCfg = Release|Win32
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Release|Win32.Build.0 = Release|Win32
-		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -95,10 +85,6 @@ Global
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.Debug|Win32.Build.0 = Debug|Win32
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.Release|Win32.ActiveCfg = Release|Win32
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.Release|Win32.Build.0 = Release|Win32
-		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -107,10 +93,6 @@ Global
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.Debug|Win32.Build.0 = Debug|Win32
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.Release|Win32.ActiveCfg = Release|Win32
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.Release|Win32.Build.0 = Release|Win32
-		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -119,10 +101,6 @@ Global
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.Debug|Win32.Build.0 = Debug|Win32
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.Release|Win32.ActiveCfg = Release|Win32
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.Release|Win32.Build.0 = Release|Win32
-		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -131,10 +109,6 @@ Global
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.Debug|Win32.Build.0 = Debug|Win32
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.Release|Win32.ActiveCfg = Release|Win32
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.Release|Win32.Build.0 = Release|Win32
-		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -143,10 +117,6 @@ Global
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.Debug|Win32.Build.0 = Debug|Win32
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.Release|Win32.ActiveCfg = Release|Win32
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.Release|Win32.Build.0 = Release|Win32
-		{7AA41BED-41B0-427A-9148-DEA40549D158}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{7AA41BED-41B0-427A-9148-DEA40549D158}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{7AA41BED-41B0-427A-9148-DEA40549D158}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{7AA41BED-41B0-427A-9148-DEA40549D158}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -155,10 +125,6 @@ Global
 		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.Debug|Win32.Build.0 = Debug|Win32
 		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.Release|Win32.ActiveCfg = Release|Win32
 		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.Release|Win32.Build.0 = Release|Win32
-		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{F00717F2-67C8-44E1-AF00-541DFA9CB7F2}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -166,9 +132,6 @@ Global
 		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}.Release|Win32.ActiveCfg = Release|Win32
 		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}.Release|Win32.Build.0 = Release|Win32
-		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
 		{3DDDCAA9-276D-4FC3-A15C-485F7B9B24CC}.wx3-Release|Win32.Build.0 = wx3-Release|Win32
@ -176,10 +139,6 @@ Global
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Debug|Win32.Build.0 = Debug|Win32
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Release|Win32.ActiveCfg = Release|Win32
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Release|Win32.Build.0 = Release|Win32
-		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -188,10 +147,6 @@ Global
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.Debug|Win32.Build.0 = Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.Release|Win32.ActiveCfg = Release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.Release|Win32.Build.0 = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -200,10 +155,6 @@ Global
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug|Win32.Build.0 = Debug|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.ActiveCfg = Release|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.Build.0 = Release|Win32
-		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -212,10 +163,6 @@ Global
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.Debug|Win32.Build.0 = Debug|Win32
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.Release|Win32.ActiveCfg = Release|Win32
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.Release|Win32.Build.0 = Release|Win32
-		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -224,10 +171,6 @@ Global
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Debug|Win32.Build.0 = Debug|Win32
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Release|Win32.ActiveCfg = Release|Win32
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Release|Win32.Build.0 = Release|Win32
-		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -235,9 +178,6 @@ Global
 		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Release|Win32.ActiveCfg = Release|Win32
 		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Release|Win32.Build.0 = Release|Win32
-		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
 		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.wx3-Release|Win32.Build.0 = wx3-Release|Win32
@ -245,10 +185,6 @@ Global
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.Debug|Win32.Build.0 = Debug|Win32
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.Release|Win32.ActiveCfg = Release|Win32
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.Release|Win32.Build.0 = Release|Win32
-		{5284D863-3813-479F-BBF0-AC234E216BC6}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{5284D863-3813-479F-BBF0-AC234E216BC6}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{5284D863-3813-479F-BBF0-AC234E216BC6}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{5284D863-3813-479F-BBF0-AC234E216BC6}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -257,10 +193,6 @@ Global
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.Debug|Win32.Build.0 = Debug|Win32
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.Release|Win32.ActiveCfg = Release|Win32
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.Release|Win32.Build.0 = Release|Win32
-		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -269,10 +201,6 @@ Global
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug|Win32.Build.0 = Debug|Win32
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Release|Win32.ActiveCfg = Release|Win32
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Release|Win32.Build.0 = Release|Win32
-		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -281,10 +209,6 @@ Global
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Debug|Win32.Build.0 = Debug|Win32
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Release|Win32.ActiveCfg = Release|Win32
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Release|Win32.Build.0 = Release|Win32
-		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -293,10 +217,6 @@ Global
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Debug|Win32.Build.0 = Debug|Win32
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Release|Win32.ActiveCfg = Release|Win32
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Release|Win32.Build.0 = Release|Win32
-		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -305,10 +225,6 @@ Global
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.Debug|Win32.Build.0 = Debug|Win32
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.Release|Win32.ActiveCfg = Release|Win32
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.Release|Win32.Build.0 = Release|Win32
-		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -317,10 +233,6 @@ Global
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.Debug|Win32.Build.0 = Debug|Win32
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.Release|Win32.ActiveCfg = Release|Win32
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.Release|Win32.Build.0 = Release|Win32
-		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -328,9 +240,6 @@ Global
 		{02F94A40-586A-4403-8464-13B50801FFEC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{02F94A40-586A-4403-8464-13B50801FFEC}.Release|Win32.ActiveCfg = Release|Win32
 		{02F94A40-586A-4403-8464-13B50801FFEC}.Release|Win32.Build.0 = Release|Win32
-		{02F94A40-586A-4403-8464-13B50801FFEC}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{02F94A40-586A-4403-8464-13B50801FFEC}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{02F94A40-586A-4403-8464-13B50801FFEC}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{02F94A40-586A-4403-8464-13B50801FFEC}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{02F94A40-586A-4403-8464-13B50801FFEC}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
 		{02F94A40-586A-4403-8464-13B50801FFEC}.wx3-Release|Win32.Build.0 = wx3-Release|Win32
@ -338,10 +247,6 @@ Global
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.Debug|Win32.Build.0 = Debug|Win32
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.Release|Win32.ActiveCfg = Release|Win32
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.Release|Win32.Build.0 = Release|Win32
-		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -350,10 +255,6 @@ Global
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Debug|Win32.Build.0 = Debug|Win32
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Release|Win32.ActiveCfg = Release|Win32
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Release|Win32.Build.0 = Release|Win32
-		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32
@ -364,10 +265,6 @@ Global
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Release|Win32.ActiveCfg = Release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Release|Win32.Build.0 = Release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Release|Win32.Deploy.0 = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.wx31-debug|Win32.ActiveCfg = wx31-debug|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.wx31-debug|Win32.Build.0 = wx31-debug|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.wx31-release|Win32.ActiveCfg = wx31-release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.wx31-release|Win32.Build.0 = wx31-release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.wx3-Debug|Win32.ActiveCfg = wx3-Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.wx3-Debug|Win32.Build.0 = wx3-Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.wx3-Release|Win32.ActiveCfg = wx3-Release|Win32