--- trunk/xvidcore/dshow/src/xvid.ax.rc	2004/04/18 07:55:11	1437
+++ branches/release-1_3-branch/xvidcore/dshow/src/xvid.ax.rc	2011/02/14 16:59:16	1949
@@ -8,94 +8,33 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include <windows.h>
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
+// Neutral resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 #ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Bitmap
-//
-
-IDB_LOGO                BITMAP  DISCARDABLE     "XviD_logo.bmp"
-#endif    // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (Australia) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include <windows.h>\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 209
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 236
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Dialog
 //
 
-IDD_ABOUT DIALOG DISCARDABLE  0, 0, 216, 239
+IDD_ABOUT DIALOG DISCARDABLE  0, 0, 216, 267
 STYLE WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         103,IDC_STATIC,"Static",SS_BITMAP,36,7,142,27
-    CTEXT           "XVID MPEG-4 VIDEO CODEC",IDC_STATIC,36,34,142,15,
+    CONTROL         IDB_LOGO,IDC_STATIC,"Static",SS_BITMAP,36,7,142,29
+    CTEXT           "Xvid MPEG-4 Video Codec",IDC_STATIC,36,34,142,15,
                     SS_CENTERIMAGE | SS_SUNKEN
     GROUPBOX        "Brightness",IDC_STATIC,7,54,202,39
     CONTROL         "Slider1",IDC_BRIGHTNESS,"msctls_trackbar32",
@@ -110,7 +49,7 @@
     CONTROL         "Film Effect",IDC_FILMEFFECT,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,158,109,47,10
     GROUPBOX        "Output",IDC_STATIC,7,141,202,43
-    CONTROL         "Flip video",IDC_FLIPVIDEO,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "Flip Video",IDC_FLIPVIDEO,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,23,154,46,10
     CONTROL         "Compatibility Renderer",IDC_COMPAT,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,23,167,88,12
@@ -118,17 +57,67 @@
                     WS_VSCROLL | WS_TABSTOP
     CONTROL         "DIVX",IDC_DIVX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,
                     198,47,13
-    CONTROL         "DX50",IDC_DX50,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,
+    CONTROL         "3IVX",IDC_3IVX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,
                     198,43,13
-    GROUPBOX        "FourCC support",IDC_STATIC,7,187,202,29
-    CONTROL         "mp4v",IDC_MP4V,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
+    GROUPBOX        "Other MPEG-4 video support",IDC_STATIC,7,187,202,29
+    CONTROL         "Other",IDC_MP4V,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
                     160,198,38,13
-    PUSHBUTTON      "Reset",IDC_RESET,79,220,50,12
+    PUSHBUTTON      "Reset",IDC_RESET,79,252,50,12
     LTEXT           "Output Colourspace",IDC_STATIC,136,151,67,9
     CONTROL         "Dering (UV)",IDC_DERINGUV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,98,123,53,10
+    GROUPBOX        "Aspect Ratio",IDC_STATIC,7,221,202,25
+    LTEXT           "After restarting player, use this AR:",IDC_STATIC,14,
+                    233,109,8
+    COMBOBOX        IDC_USE_AR,135,230,68,95,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_LOGO                BITMAP  DISCARDABLE     "XviD_logo.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON                ICON    DISCARDABLE     "xvid.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include <windows.h>\r\n"
+    "#ifndef IDC_STATIC\r\n"
+    "#define IDC_STATIC (-1)\r\n"
+    "#endif\r\n"
+    "\0"
 END
 
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -140,7 +129,7 @@
     IDS_ABOUT               "About"
 END
 
-#endif    // English (Australia) resources
+#endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////