[opensource-dev] STORM-859 or "#define IDC_STATIC and stop #include(ing) old sample code"

[Ardy Lay]

Seems to me we should keep them ducks all in a row like this:

#define IDC_STATIC and stop #include(ing) old sample code

diff -r d596dec15189 -r 6574bf647d32 indra/newview/res/resource.h
--- a/indra/newview/res/resource.h    Mon May 09 14:39:23 2011 -0500
+++ b/indra/newview/res/resource.h    Mon May 09 14:39:23 2011 -0500
@@ -38,6 +38,7 @@
  #define IDC_CURSOR5                     154
  #define IDI_LCD_LL_ICON                 157
  #define IDC_CURSOR6                     158
+#define IDC_STATIC                      1000
  #define IDC_RADIO_56                    1000
  #define IDC_RADIO_128                   1001
  #define IDC_RADIO_256                   1002
diff -r d596dec15189 -r 6574bf647d32 indra/newview/res/viewerRes.rc
--- a/indra/newview/res/viewerRes.rc    Mon May 09 14:39:23 2011 -0500
+++ b/indra/newview/res/viewerRes.rc    Mon May 09 14:39:23 2011 -0500
@@ -7,7 +7,7 @@
  //
  // Generated from the TEXTINCLUDE 2 resource.
  //
-#include "winres.h"
+#include "windows.h"


/////////////////////////////////////////////////////////////////////////////
  #undef APSTUDIO_READONLY_SYMBOLS