Sync to Wine-20050930:
Michael Jung <mjung(a)iss.tu-darmstadt.de>
- Fixed inconsistency in LISTVIEW_DUMP macro.
Robert Shearman <rob(a)codeweavers.com>
- Add support for navigating a toolbar with the arrow keys.
- Fix WrapToolbar in the case of no parent window.
- Use the newly added NMTBINITCUSTOMIZE for sending the
TBN_INITCUSTOMIZE so that it is safe on 64-bit platforms.
Aric Stewart <aric(a)codeweavers.com>
- Reading the MRUlist using the W functions we need to divide the size
by sizeof(WCHAR) to get the count of characters.
Alexandre Julliard <julliard(a)winehq.org>
- Specify 64-bit integers as double instead of long long in spec files
so that we get the correct number of arguments.
- We are no longer generating .dbg.c files.
Milko Krachounov <milko(a)3mhz.net>
- Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw,
shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui,
setupapi, wininet, regedit, uninstaller, notepad, winecfg and
winhelp.
Dmitry Timoshkov <dmitry(a)codeweavers.com>
- Call SetDIBits with a proper DC in order to set bitmap bits.
Mike McCormack <mike(a)codeweavers.com>
- Fix if's that are followed by semicolons.
Alexander N. Sørnes <alex(a)thehandofagony.com>
- Added Norwegian translation of comctl32 and shell32.
Marcus Meissner <marcus(a)jet.franken.de>
- The last argument to MultiByteToWideChar is wide character count and
not the buffer size in bytes. Fixed all places where it was wrong.
Frank Richter <frank.richter(a)gmail.com>
- Unregister theming subclasses at comctl32 shutdown; should fix
reported re-registration errors.
Jason Edmeades <us(a)edmeades.me.uk>
- Fix some off by one calculations in the comboboxex functions, and
handle an out of range positive index the same as windows + unit test
case.
Modified: trunk/reactos/include/wine/commctrl.h
Modified: trunk/reactos/lib/comctl32/animate.c
Modified: trunk/reactos/lib/comctl32/comboex.c
Modified: trunk/reactos/lib/comctl32/comctl32.h
Modified: trunk/reactos/lib/comctl32/comctl32.spec
Modified: trunk/reactos/lib/comctl32/comctl32undoc.c
Added: trunk/reactos/lib/comctl32/comctl_Bg.rc
Modified: trunk/reactos/lib/comctl32/comctl_Cn.rc
Modified: trunk/reactos/lib/comctl32/comctl_Cs.rc
Modified: trunk/reactos/lib/comctl32/comctl_De.rc
Modified: trunk/reactos/lib/comctl32/comctl_En.rc
Modified: trunk/reactos/lib/comctl32/comctl_Es.rc
Modified: trunk/reactos/lib/comctl32/comctl_Fr.rc
Modified: trunk/reactos/lib/comctl32/comctl_It.rc
Modified: trunk/reactos/lib/comctl32/comctl_Ja.rc
Modified: trunk/reactos/lib/comctl32/comctl_Ko.rc
Modified: trunk/reactos/lib/comctl32/comctl_Nl.rc
Added: trunk/reactos/lib/comctl32/comctl_No.rc
Modified: trunk/reactos/lib/comctl32/comctl_Pl.rc
Modified: trunk/reactos/lib/comctl32/comctl_Pt.rc
Modified: trunk/reactos/lib/comctl32/comctl_Ru.rc
Modified: trunk/reactos/lib/comctl32/comctl_Si.rc
Modified: trunk/reactos/lib/comctl32/comctl_Th.rc
Modified: trunk/reactos/lib/comctl32/comctl_Uk.rc
Modified: trunk/reactos/lib/comctl32/commctrl.c
Modified: trunk/reactos/lib/comctl32/listview.c
Modified: trunk/reactos/lib/comctl32/propsheet.c
Modified: trunk/reactos/lib/comctl32/rebar.c
Modified: trunk/reactos/lib/comctl32/rsrc.rc
Modified: trunk/reactos/lib/comctl32/theming.c
Modified: trunk/reactos/lib/comctl32/toolbar.c
Modified: trunk/reactos/lib/comctl32/treeview.c
Modified: trunk/reactos/w32api/include/commctrl.h
_____
Modified: trunk/reactos/include/wine/commctrl.h
--- trunk/reactos/include/wine/commctrl.h 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/include/wine/commctrl.h 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -50,6 +50,8 @@
#define TB_UNKWN463 (WM_USER+99)
#define TB_UNKWN464 (WM_USER+100)
+#define TBN_WRAPHOTITEM (TBN_FIRST-24) /* this is undocumented
and the name is a guess */
+
#define RBBS_USECHEVRON 0x00000200
#define RBHT_CHEVRON 0x0008
#define RBN_CHEVRONPUSHED (RBN_FIRST-10)
@@ -82,4 +84,19 @@
'_','D','r','a','g','L','i','s','t','M','s','g',0
};
#endif
+/* these are undocumented and the names are guesses */
+typedef struct
+{
+ NMHDR hdr;
+ HWND hwndDialog;
+} NMTBINITCUSTOMIZE;
+
+typedef struct
+{
+ NMHDR hdr;
+ INT idNew;
+ INT iDirection; /* left is -1, right is 1 */
+ DWORD dwReason; /* HICF_* */
+} NMTBWRAPHOTITEM;
+
#endif /* __WINE_COMMCTRL_H */
_____
Modified: trunk/reactos/lib/comctl32/animate.c
--- trunk/reactos/lib/comctl32/animate.c 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/animate.c 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -252,15 +252,12 @@
static BOOL ANIMATE_PaintFrame(ANIMATE_INFO* infoPtr, HDC hDC)
{
- void* pBitmapData = NULL;
- LPBITMAPINFO pBitmapInfo = NULL;
-
+ void *pBitmapData;
+ LPBITMAPINFO pBitmapInfo;
HDC hdcMem;
HBITMAP hbmOld;
-
int nOffsetX = 0;
int nOffsetY = 0;
-
int nWidth;
int nHeight;
@@ -289,11 +286,11 @@
infoPtr->hbmPrevFrame=CreateCompatibleBitmap(hDC,
nWidth,nHeight );
}
- SetDIBits(hDC, infoPtr->hbmPrevFrame, 0, nHeight, pBitmapData,
(LPBITMAPINFO)pBitmapInfo, DIB_RGB_COLORS);
-
hdcMem = CreateCompatibleDC(hDC);
hbmOld = SelectObject(hdcMem, infoPtr->hbmPrevFrame);
+ SetDIBits(hdcMem, infoPtr->hbmPrevFrame, 0, nHeight, pBitmapData,
pBitmapInfo, DIB_RGB_COLORS);
+
/*
* we need to get the transparent color even without
ACS_TRANSPARENT,
* because the style can be changed later on and the color should
always
_____
Modified: trunk/reactos/lib/comctl32/comboex.c
--- trunk/reactos/lib/comctl32/comboex.c 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/comboex.c 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -473,7 +473,7 @@
CBE_ITEMDATA *item;
INT i;
- if ((index > infoPtr->nb_items) || (index < -1))
+ if ((index >= infoPtr->nb_items) || (index < -1))
return 0;
if (index == -1)
return infoPtr->edit;
@@ -509,7 +509,7 @@
TRACE("(index=%d)\n", index);
/* if item number requested does not exist then return failure */
- if ((index > infoPtr->nb_items) || (index < 0)) return CB_ERR;
+ if ((index >= infoPtr->nb_items) || (index < 0)) return CB_ERR;
if (!(item = COMBOEX_FindItem(infoPtr, index))) return CB_ERR;
/* doing this will result in WM_DELETEITEM being issued */
@@ -527,7 +527,7 @@
TRACE("(...)\n");
/* if item number requested does not exist then return failure */
- if ((index > infoPtr->nb_items) || (index < -1)) return FALSE;
+ if ((index >= infoPtr->nb_items) || (index < -1)) return FALSE;
/* if the item is the edit control and there is no edit control,
skip */
if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE;
@@ -587,7 +587,7 @@
/* get real index of item to insert */
index = cit->iItem;
if (index == -1) index = infoPtr->nb_items;
- if (index > infoPtr->nb_items) index = infoPtr->nb_items;
+ if (index > infoPtr->nb_items) return -1;
/* get zero-filled space and chain it in */
if(!(item = (CBE_ITEMDATA *)Alloc (sizeof(*item)))) return -1;
@@ -740,7 +740,7 @@
if (TRACE_ON(comboex)) COMBOEX_DumpInput (cit);
/* if item number requested does not exist then return failure */
- if ((index > infoPtr->nb_items) || (index < -1)) return FALSE;
+ if ((index >= infoPtr->nb_items) || (index < -1)) return FALSE;
/* if the item is the edit control and there is no edit control,
skip */
if ((index == -1) && !COMBOEX_HasEdit(infoPtr)) return FALSE;
_____
Modified: trunk/reactos/lib/comctl32/comctl32.h
--- trunk/reactos/lib/comctl32/comctl32.h 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/comctl32.h 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -250,6 +250,7 @@
}
extern void THEMING_Initialize(void);
+extern void THEMING_Uninitialize(void);
extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM);
extern void THEMING_SetSubclassData(HWND, ULONG_PTR);
_____
Modified: trunk/reactos/lib/comctl32/comctl32.spec
--- trunk/reactos/lib/comctl32/comctl32.spec 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/comctl32.spec 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -15,7 +15,7 @@
11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long)
#12 stub Cctl1632_ThunkData32
13 stdcall MakeDragList(long)
- 14 stdcall LBItemFromPt(long long long long)
+ 14 stdcall LBItemFromPt(long double long)
15 stdcall DrawInsert(long long long)
16 stdcall CreateUpDownControl(long long long long long long long long
long long long long)
17 stdcall InitCommonControls()
_____
Modified: trunk/reactos/lib/comctl32/comctl32undoc.c
--- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -579,7 +579,7 @@
if (!stringW)
return -1;
- MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW, len);
+ MultiByteToWideChar(CP_ACP, 0, lpszString, -1, stringW,
len/sizeof(WCHAR));
ret = AddMRUData(hList, stringW, len);
Free(stringW);
return ret;
@@ -689,6 +689,8 @@
datasize = 2;
*mp->realMRU = 0;
}
+ else
+ datasize /= sizeof(WCHAR);
TRACE("MRU list = %s, datasize = %ld\n",
debugstr_w(mp->realMRU), datasize);
_____
Copied: trunk/reactos/lib/comctl32/comctl_Bg.rc (from rev 18327,
vendor/wine/dlls/comctl32/current/comctl_Bg.rc)
Property changes on: trunk/reactos/lib/comctl32/comctl_Bg.rc
___________________________________________________________________
Name: svn:keywords + Author Date Id Revision Name: svn:eol-style +
native
_____
Modified: trunk/reactos/lib/comctl32/comctl_Cn.rc
--- trunk/reactos/lib/comctl32/comctl_Cn.rc 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/comctl_Cn.rc 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -1,90 +1,90 @@
-/*
- * Copyright 2002 Tisheng Chen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_VISIBLE
-CAPTION "?¶ðÈ "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "?À¿", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "?í¤¹", IDCANCEL,58,122,50,14
- PUSHBUTTON "˪Ë?(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "?´Í·", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS
_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< ?¤Ê??¢(&B)", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "¤?Ê??¢(&N) >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "¢ß?°", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "?í¤¹", IDCANCEL,178,138,50,14
- PUSHBUTTON "?´Í·", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "",
IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD |
WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ÎÈ¿ÊÕ?ñ¥??©"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "?Ï?i(&C)", IDCANCEL,308,6,44,14
- PUSHBUTTON "ÍÏÍ?(&e)", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "?´Í·(&H)", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "?¤Êã(&U)", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "¤?Êã(&D)", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "??Ë??ñ¥??©???Ñ(&V):", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "?Ý?Ë(&A) ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- ?¥?²(&R)", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "Á?Ã??ñ¥??©???Ñ(&T):", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "?Ï?i"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Today:"
- IDM_GOTODAY "Go to today"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "ÀÍ©¶À¹"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "None"
-}
-
-#pragma code_page(default)
+/*
+ * Copyright 2002 Tisheng Chen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ */
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+#pragma code_page(936)
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_VISIBLE
+CAPTION "?¶ðÈ "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "?À¿", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "?í¤¹", IDCANCEL,58,122,50,14
+ PUSHBUTTON "˪Ë?(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "?´Í·", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS
_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< ?¤Ê??¢(&B)", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "¤?Ê??¢(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "¢ß?°", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "?í¤¹", IDCANCEL,178,138,50,14
+ PUSHBUTTON "?´Í·", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "",
IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD |
WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ÎÈ¿ÊÕ?ñ¥??©"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "?Ï?i(&C)", IDCANCEL,308,6,44,14
+ PUSHBUTTON "ÍÏÍ?(&e)", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "?´Í·(&H)", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "?¤Êã(&U)", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "¤?Êã(&D)", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "??Ë??ñ¥??©???Ñ(&V):", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "?Ý?Ë(&A) ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- ?¥?²(&R)", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "Á?Ã??ñ¥??©???Ñ(&T):", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "?Ï?i"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Today:"
+ IDM_GOTODAY "Go to today"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "ÀÍ©¶À¹"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "None"
+}
+
+#pragma code_page(default)
_____
Modified: trunk/reactos/lib/comctl32/comctl_Cs.rc
--- trunk/reactos/lib/comctl32/comctl_Cs.rc 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/comctl_Cs.rc 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -1,90 +1,90 @@
-/*
- * Copyright 1999 Eric Kohl
- *
- * Czech resources for comctl32
- * Copyright 2004 David Kredba
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
- */
-
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_VISIBLE
-CAPTION "Vlastnosti "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Storno", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Pou¥Ýt", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Nßpovýda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS
_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Pr¨vodce"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Zpýt", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Dal?Ý >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "DokonÞit", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Storno", IDCANCEL,178,138,50,14
- PUSHBUTTON "Nßpovýda", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "",
IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD |
WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "NastavenÝ panelu"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Zav°Ýt", IDCANCEL,308,6,44,14
- PUSHBUTTON "&V²chozÝ", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Nßpovýda", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Nahor&u", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "&Dol¨", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "D&ostupnß tlaÞÝtka:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "P°id&at ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- Odeb&rat", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&TlaÞÝtka panelu:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Zav°Ýt"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Dnes:"
- IDM_GOTODAY "Jdi na dne?ek"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "OddýlovaÞ"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "«ßdn²"
-}
+/*
+ * Copyright 1999 Eric Kohl
+ *
+ * Czech resources for comctl32
+ * Copyright 2004 David Kredba
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ */
+
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_VISIBLE
+CAPTION "Vlastnosti "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Storno", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Pou¥Ýt", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Nßpovýda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS
_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Pr¨vodce"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Zpýt", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Dal?Ý >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "DokonÞit", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Storno", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Nßpovýda", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "",
IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD |
WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "NastavenÝ panelu"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Zav°Ýt", IDCANCEL,308,6,44,14
+ PUSHBUTTON "&V²chozÝ", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Nßpovýda", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Nahor&u", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "&Dol¨", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "D&ostupnß tlaÞÝtka:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "P°id&at ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- Odeb&rat", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&TlaÞÝtka panelu:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Zav°Ýt"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Dnes:"
+ IDM_GOTODAY "Jdi na dne?ek"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "OddýlovaÞ"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "«ßdn²"
+}
_____
Modified: trunk/reactos/lib/comctl32/comctl_De.rc
--- trunk/reactos/lib/comctl32/comctl_De.rc 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/comctl_De.rc 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -1,87 +1,87 @@
-/*
- * Copyright 2000 Uwe Bonnes
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
- */
-
-LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Schlie?en"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Heute:"
- IDM_GOTODAY "Gehe zu Heute"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Trennzeichen"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Keiner"
-}
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_VISIBLE
-CAPTION "Eigenschaften f³r "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "A&bbrechen", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Anwenden",
IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "&Hilfe", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS
_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Zur³ck", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14
- PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "",
IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD |
WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Toolbar einrichten"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Schlie?en", IDCANCEL,308,6,44,14
- PUSHBUTTON "&Zur³cksetzen", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Hilfe", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Nach &Oben verschieben", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Nach &Unten verschieben", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "&Vorhandene Kn÷pfe:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "H&inzuf³gen ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &L÷schen", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Toolbarkn÷pfe:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
+/*
+ * Copyright 2000 Uwe Bonnes
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ */
+
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Schlie?en"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Heute:"
+ IDM_GOTODAY "Gehe zu Heute"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Trennzeichen"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "Keiner"
+}
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_VISIBLE
+CAPTION "Eigenschaften f³r "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "A&bbrechen", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Anwenden",
IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "&Hilfe", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS
_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Zur³ck", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14
+ PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "",
IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD |
WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Toolbar einrichten"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Schlie?en", IDCANCEL,308,6,44,14
+ PUSHBUTTON "&Zur³cksetzen", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Hilfe", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Nach &Oben verschieben", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Nach &Unten verschieben", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "&Vorhandene Kn÷pfe:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "H&inzuf³gen ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &L÷schen", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Toolbarkn÷pfe:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
_____
Modified: trunk/reactos/lib/comctl32/comctl_En.rc
--- trunk/reactos/lib/comctl32/comctl_En.rc 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/comctl_En.rc 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -1,87 +1,87 @@
-/*
- * Copyright 1999 Eric Kohl
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
- */
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_VISIBLE
-CAPTION "Properties for "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Cancel", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Apply", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS
_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Back", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Cancel", IDCANCEL,178,138,50,14
- PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "",
IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD |
WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Customize Toolbar"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Close", IDCANCEL,308,6,44,14
- PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "A&vailable buttons:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Toolbar buttons:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Close"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Today:"
- IDM_GOTODAY "Go to today"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Separator"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "None"
-}
+/*
+ * Copyright 1999 Eric Kohl
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ */
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_VISIBLE
+CAPTION "Properties for "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Cancel", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Apply", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS
_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Back", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Cancel", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "",
IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD |
WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Customize Toolbar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Close", IDCANCEL,308,6,44,14
+ PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "A&vailable buttons:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Toolbar buttons:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Close"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Today:"
+ IDM_GOTODAY "Go to today"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Separator"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "None"
+}
_____
Modified: trunk/reactos/lib/comctl32/comctl_Es.rc
--- trunk/reactos/lib/comctl32/comctl_Es.rc 2005-10-08 12:47:53 UTC
(rev 18328)
+++ trunk/reactos/lib/comctl32/comctl_Es.rc 2005-10-08 13:20:03 UTC
(rev 18329)
@@ -1,87 +1,87 @@
-/*
- * Copyright 2003 JosÚ Manuel Ferrer Ortiz
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
- */
-
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_VISIBLE
-CAPTION "Propiedades de "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Ayuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS
_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ayudante"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Anterior", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Terminar", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14
- PUSHBUTTON "Ayuda", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab",
IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "",
IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD |
WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Personalizar barra de herramientas"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Cerrar", IDCANCEL,308,6,44,14
- PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Ayuda", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Mover A&rriba", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Mover A&bajo", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "Botones &disponibles:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "A&±adir ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Eliminar", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "B&otones de la barra:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY |
LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Cerrar"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Hoy:"
- IDM_GOTODAY "Ir a hoy"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Separador"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Ninguno"
-}
+/*
+ * Copyright 2003 JosÚ Manuel Ferrer Ortiz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
[truncated at 1000 lines; 4838 more skipped]