Revision: 336
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=336&view=rev
Author: pstieber
Date: 2008-03-20 22:42:08 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
Changed some resource IDs to standard wxWidgets values.
Modified Paths:
--------------
trunk/jazz/src/SampleWindow.cpp
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2008-03-21 05:40:29 UTC (rev 335)
+++ trunk/jazz/src/SampleWindow.cpp 2008-03-21 05:42:08 UTC (rev 336)
@@ -48,9 +48,6 @@
#define MEN_SAVEAS 6
#define MEN_REVERT 7
-#define MEN_CUT 10
-#define MEN_COPY 11
-
#define MEN_PASTE 12
#define MEN_PASTE_MIX 15
@@ -69,8 +66,6 @@
#define MEN_TRANSP_PNT 28
#define MEN_TRANSP_SET 29
-#define MEN_ZOOM_IN 40
-#define MEN_ZOOM_OUT 41
#define MEN_ACCEPT 42
#define MEN_CANCEL 43
#define MEN_ECHO 44
@@ -643,8 +638,8 @@
{ MEN_LOAD, FALSE, open_xpm, "open wave file" },
{ MEN_SAVE, FALSE, save_xpm, "save wave file" },
{ JZToolBar::eToolBarSeparator },
- { MEN_ZOOM_IN, FALSE, zoomin_xpm, "zoom to selection" },
- { MEN_ZOOM_OUT, FALSE, zoomout_xpm, "zoom out" },
+ { wxID_ZOOM_IN, FALSE, zoomin_xpm, "zoom to selection" },
+ { wxID_ZOOM_OUT, FALSE, zoomout_xpm, "zoom out" },
{ MEN_ACCEPT, FALSE, accept_xpm, "accept painting" },
{ MEN_CANCEL, FALSE, cancel_xpm, "cancel painting" },
{ JZToolBar::eToolBarSeparator },
@@ -710,8 +705,8 @@
menu_bar->Append(menu, "&File");
menu = new wxMenu;
- menu->Append(MEN_CUT, "&Cut");
- menu->Append(MEN_COPY, "Co&py");
+ menu->Append(wxID_CUT, "&Cut");
+ menu->Append(wxID_COPY, "Co&py");
menu->Append(MEN_PASTE, "&Paste");
menu->Append(MEN_PASTE_MIX, "Paste &Merge");
@@ -751,8 +746,8 @@
menu = new wxMenu;
menu->Append(MEN_TRANSP_SET, "&Pitch Painter ...");
menu->Append(MEN_WAHSETTINGS, "&Filter Painter ...");
- //menu->Append(MEN_ZOOM_IN, "Zoom &In");
- //menu->Append(MEN_ZOOM_OUT, "Zoom &Out");
+// menu->Append(wxID_ZOOM_IN, "Zoom &In");
+// menu->Append(wxID_ZOOM_OUT, "Zoom &Out");
menu->Append(MEN_SETTINGS, "&View Settings...");
menu_bar->Append(menu, "&Settings");
@@ -1109,7 +1104,7 @@
}
break;
- case MEN_CUT:
+ case wxID_CUT:
{
int fr, to;
if (HaveSelection(fr, to, SelWarn))
@@ -1122,7 +1117,7 @@
}
break;
- case MEN_COPY:
+ case wxID_COPY:
{
int fr, to;
if (HaveSelection(fr, to, SelAll))
@@ -1130,7 +1125,7 @@
}
break;
- case MEN_ZOOM_IN:
+ case wxID_ZOOM_IN:
{
int fr, to;
if (HaveSelection(fr, to, SelWarn))
@@ -1138,7 +1133,7 @@
}
break;
- case MEN_ZOOM_OUT:
+ case wxID_ZOOM_OUT:
SetViewPos(0, spl.GetLength());
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
