ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve handling of custom dialog templates passed to 

GetOpenFileName.
This commit is contained in:
Dmitry Timoshkov 2003-07-28 19:14:24 +00:00 committed by Alexandre Julliard
parent 69e609d9e5
commit b96b3d15b5
26 changed files with 290 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/commdlg/cdlg_Ca.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134

12
dlls/commdlg/cdlg_Cn.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -318,12 +322,10 @@ BEGIN
PUSHBUTTON "打印机(&P)...", psh3, 184, 220, 48, 14 PUSHBUTTON "打印机(&P)...", psh3, 184, 220, 48, 14
END END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 287, 165
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "打开" CAPTION "打开"
FONT 8, "helv" FONT 8, "Helv"
{ {
LTEXT "搜寻(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY LTEXT "搜寻(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

4
dlls/commdlg/cdlg_Cs.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134

4
dlls/commdlg/cdlg_Da.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134

10
dlls/commdlg/cdlg_De.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -240,10 +244,10 @@ FONT 8, "Helv"
PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
} }
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 307, 165 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
CAPTION "Öffnen" CAPTION "Öffnen"
FONT 8, "helv" FONT 8, "Helv"
{ {
LTEXT "&Suche in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY LTEXT "&Suche in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

16
dlls/commdlg/cdlg_En.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -318,14 +322,12 @@ BEGIN
PUSHBUTTON "P&rinter...", psh3, 184, 220, 48, 14 PUSHBUTTON "P&rinter...", psh3, 184, 220, 48, 14
END END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 287, 165
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Open" CAPTION "Open"
FONT 8, "helv" FONT 8, "Helv"
{ {
LTEXT "Look &in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY LTEXT "Look &in:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
@ -334,7 +336,7 @@ FONT 8, "helv"
LTEXT "File &name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY LTEXT "File &name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
LTEXT "Files of &type",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY LTEXT "Files of &type:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
CONTROL "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 CONTROL "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10

4
dlls/commdlg/cdlg_Eo.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134

4
dlls/commdlg/cdlg_Es.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134

4
dlls/commdlg/cdlg_Fi.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134

12
dlls/commdlg/cdlg_Fr.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -318,12 +322,10 @@ BEGIN
PUSHBUTTON "&Imprimante...", psh3, 184, 220, 48, 14 PUSHBUTTON "&Imprimante...", psh3, 184, 220, 48, 14
END END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 307, 165
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Ouvrir" CAPTION "Ouvrir"
FONT 8, "helv" FONT 8, "Helv"
{ {
LTEXT "&Rechercher dans",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY LTEXT "&Rechercher dans",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

4
dlls/commdlg/cdlg_Hu.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
OPEN_FILE DIALOG 36, 24, 275, 134 OPEN_FILE DIALOG 36, 24, 275, 134

4
dlls/commdlg/cdlg_It.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134

7
dlls/commdlg/cdlg_Ja.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -288,9 +292,8 @@ BEGIN
CONTROL "横(&A)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 CONTROL "横(&A)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
END END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
CAPTION "ﾌｧｲﾙを開く" CAPTION "ﾌｧｲﾙを開く"
FONT 8, "ＭＳ Ｐゴシック" FONT 8, "ＭＳ Ｐゴシック"
{ {

8
dlls/commdlg/cdlg_Ko.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -268,8 +272,8 @@ FONT 9, "Helv"
PUSHBUTTON "도움말(&H)", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "도움말(&H)", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
} }
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 287, 165 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
CAPTION "열기" CAPTION "열기"
FONT 9, "Helv" FONT 9, "Helv"
{ {

4
dlls/commdlg/cdlg_Nl.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134

4
dlls/commdlg/cdlg_No.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134

4
dlls/commdlg/cdlg_Pl.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
/* LTEXT "Wyswietl pliki &typu:", 1089, 6, 104, 90, 9 */ /* LTEXT "Wyswietl pliki &typu:", 1089, 6, 104, 90, 9 */

8
dlls/commdlg/cdlg_Pt.rc
View File

@ -17,6 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -320,9 +324,9 @@ BEGIN
END END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
CAPTION "Abrir" CAPTION "Abrir"
FONT 8, "helv" FONT 8, "Helv"
{ {
LTEXT "&Examinar:",IDC_LOOKINSTATIC,5,6,31,8, SS_NOTIFY LTEXT "&Examinar:",IDC_LOOKINSTATIC,5,6,31,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,40,3,134,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LOOKIN,40,3,134,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

11
dlls/commdlg/cdlg_Ru.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -287,11 +291,10 @@ BEGIN
CONTROL "Ë&àíäøàôò", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 CONTROL "Ë&àíäøàôò", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
END END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 287, 165 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Îòêðûòü" CAPTION "Îòêðûòü"
FONT 8, "Ms Sans Serif" FONT 8, "MS Sans Serif"
{ {
LTEXT "Èñêàòü &â",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY LTEXT "Èñêàòü &â",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

10
dlls/commdlg/cdlg_Si.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -318,10 +322,8 @@ BEGIN
PUSHBUTTON "&Tiskalnik ...", psh3, 184, 220, 48, 14 PUSHBUTTON "&Tiskalnik ...", psh3, 184, 220, 48, 14
END END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 287, 165
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Odpiranje" CAPTION "Odpiranje"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
{ {

13
dlls/commdlg/cdlg_Sk.rc
View File

@ -16,12 +16,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
/* Slovak strings in CP1250 */ /* Slovak strings in CP1250 */
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
STYLE WS_CLIPCHILDREN | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Otvorenie súboru" CAPTION "Otvorenie súboru"
FONT 8, "Helv" FONT 8, "Helv"
{ {
@ -289,11 +293,10 @@ BEGIN
CONTROL "Na ší&rku", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 CONTROL "Na ší&rku", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
END END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 287, 165 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Otvori<72>" CAPTION "Otvori<72>"
FONT 8, "helv" FONT 8, "Helv"
{ {
LTEXT "H¾ada<64> &v",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY LTEXT "H¾ada<64> &v",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

10
dlls/commdlg/cdlg_Sv.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@ -311,10 +315,10 @@ BEGIN
PUSHBUTTON "&Skrivare...", psh3, 184, 220, 48, 14 PUSHBUTTON "&Skrivare...", psh3, 184, 220, 48, 14
END END
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 287, 165 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
CAPTION "Öppna" CAPTION "Öppna"
FONT 8, "helv" FONT 8, "Helv"
{ {
LTEXT "Leta &i",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY LTEXT "Leta &i",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

4
dlls/commdlg/cdlg_Wa.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_WALON, SUBLANG_DEFAULT LANGUAGE LANG_WALON, SUBLANG_DEFAULT
/* /*

10
dlls/commdlg/cdlg_Zh.rc
View File

@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/*
* WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
*/
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
#pragma code_page(936) /* FIXME: default for CHINESE_TRADITIONAL is 950 */ #pragma code_page(936) /* FIXME: default for CHINESE_TRADITIONAL is 950 */
@ -163,10 +167,10 @@ FONT 8, "Helv"
PUSHBUTTON "ÇóÖú(&H)", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ÇóÖú(&H)", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
} }
NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 287, 165 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
CAPTION "é_†¢Åf™n" CAPTION "é_†¢Åf™n"
FONT 8, "helv" FONT 8, "Helv"
{ {
LTEXT "ËÑŒ¤Î»ÖÃ(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY LTEXT "ËÑŒ¤Î»ÖÃ(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
COMBOBOX IDC_LOOKIN,52,3,130,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LOOKIN,52,3,130,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

313
dlls/commdlg/filedlg95.c
View File

@ -502,19 +502,30 @@ BOOL WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
return ret; return ret;
} }
void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg) /***********************************************************************
* ArrangeCtrlPositions [internal]
*
* NOTE: Do not change anything here without a lot of testing.
*/
static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hide_help)
{ {
HWND hwndChild,hwndStc32; HWND hwndChild, hwndStc32;
RECT rectParent, rectChild, rectCtrl, rectStc32, rectTemp; RECT rectParent, rectChild, rectStc32;
POINT ptMoveCtl; INT help_fixup = 0;
POINT ptParentClient;
TRACE("\n"); /* Take into account if open as read only checkbox and help button
* are hidden
ptMoveCtl.x = ptMoveCtl.y = 0; */
hwndStc32=GetDlgItem(hwndChildDlg,stc32); if (hide_help)
GetClientRect(hwndParentDlg,&rectParent); {
GetClientRect(hwndChildDlg,&rectChild); RECT rectHelp, rectCancel;
GetWindowRect(GetDlgItem(hwndParentDlg, pshHelp), &rectHelp);
GetWindowRect(GetDlgItem(hwndParentDlg, IDCANCEL), &rectCancel);
/* subtract the height of the help button plus the space between
* the help button and the cancel button to the height of the dialog
*/
help_fixup = rectHelp.bottom - rectCancel.bottom;
}
/* /*
There are two possibilities to add components to the default file dialog box. There are two possibilities to add components to the default file dialog box.
@ -528,119 +539,133 @@ void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg)
of the standard file dialog box. If they are above the stc32 component, it is placed above and so on.... of the standard file dialog box. If they are above the stc32 component, it is placed above and so on....
*/ */
if(hwndStc32)
{
GetWindowRect(hwndStc32,&rectStc32);
MapWindowPoints(0, hwndChildDlg,(LPPOINT)&rectStc32,2);
CopyRect(&rectTemp,&rectStc32);
if ((rectParent.right-rectParent.left)>(rectChild.right-rectChild.left)) { GetClientRect(hwndParentDlg, &rectParent);
ptParentClient.x = (rectParent.right-rectParent.left)+ ((rectChild.right-rectChild.left) - (rectStc32.right-rectStc32.left));
} else { /* when arranging controls we have to use fixed parent size */
ptParentClient.x = max((rectParent.right-rectParent.left),(rectChild.right-rectChild.left)); rectParent.bottom -= help_fixup;
}
ptMoveCtl.x = (rectParent.right-rectParent.left) ; hwndStc32 = GetDlgItem(hwndChildDlg, stc32);
if (hwndStc32)
if ((rectParent.bottom-rectParent.top)>(rectChild.bottom-rectChild.top)) { {
ptParentClient.y = (rectParent.bottom-rectParent.top) + (rectChild.bottom-rectChild.top) - (rectStc32.bottom-rectStc32.top); GetWindowRect(hwndStc32, &rectStc32);
} else { MapWindowPoints(0, hwndChildDlg, (LPPOINT)&rectStc32, 2);
ptParentClient.y = max((rectParent.bottom-rectParent.top),(rectChild.bottom-rectChild.top));
} /* set the size of the stc32 control according to the size of
ptMoveCtl.y = (rectParent.bottom-rectParent.top) ; * client area of the parent dialog
*/
SetWindowPos(hwndStc32, 0,
0, 0,
rectParent.right, rectParent.bottom,
SWP_NOMOVE | SWP_NOZORDER);
}
else
SetRectEmpty(&rectStc32);
/* this part moves controls of the child dialog */
hwndChild = GetWindow(hwndChildDlg, GW_CHILD);
while (hwndChild)
{
if (hwndChild != hwndStc32)
{
GetWindowRect(hwndChild, &rectChild);
MapWindowPoints(0, hwndChildDlg, (LPPOINT)&rectChild, 2);
/* move only if stc32 exist */
if (hwndStc32 && rectChild.left > rectStc32.right)
{
/* move to the right of visible controls of the parent dialog */
rectChild.left += rectParent.right;
rectChild.left -= rectStc32.right;
}
/* move even if stc32 doesn't exist */
if (rectChild.top > rectStc32.bottom)
{
/* move below visible controls of the parent dialog */
rectChild.top += rectParent.bottom;
rectChild.top -= rectStc32.bottom - rectStc32.top;
}
SetWindowPos(hwndChild, 0, rectChild.left, rectChild.top,
0, 0, SWP_NOSIZE | SWP_NOZORDER);
}
hwndChild = GetWindow(hwndChild, GW_HWNDNEXT);
}
/* this part moves controls of the parent dialog */
hwndChild = GetWindow(hwndParentDlg, GW_CHILD);
while (hwndChild)
{
if (hwndChild != hwndChildDlg)
{
GetWindowRect(hwndChild, &rectChild);
MapWindowPoints(0, hwndParentDlg, (LPPOINT)&rectChild, 2);
/* left,top of stc32 marks the position of controls
* from the parent dialog
*/
rectChild.left += rectStc32.left;
rectChild.top += rectStc32.top;
SetWindowPos(hwndChild, 0, rectChild.left, rectChild.top,
0, 0, SWP_NOSIZE | SWP_NOZORDER);
}
hwndChild = GetWindow(hwndChild, GW_HWNDNEXT);
}
/* calculate the size of the resulting dialog */
/* here we have to use original parent size */
GetClientRect(hwndParentDlg, &rectParent);
GetClientRect(hwndChildDlg, &rectChild);
if (hwndStc32)
{
if (rectParent.right > rectChild.right)
{
rectParent.right += rectChild.right;
rectParent.right -= rectStc32.right - rectStc32.left;
}
else
{
rectParent.right = rectChild.right;
}
if (rectParent.bottom > rectChild.bottom)
{
rectParent.bottom += rectChild.bottom;
rectParent.bottom -= rectStc32.bottom - rectStc32.top;
}
else
{
rectParent.bottom = rectChild.bottom;
}
} }
else else
{ {
SetRectEmpty(&rectTemp); rectParent.bottom += rectChild.bottom;
/* After some tests it appears that windows never extends the width in that case */
ptParentClient.x = (rectParent.right-rectParent.left);
ptParentClient.y = (rectParent.bottom-rectParent.top);
/* Some applications use an empty child window, add this test to prevent garbage */
if (GetWindow(hwndChildDlg,GW_CHILD))
ptParentClient.y += (rectChild.bottom-rectChild.top);
ptMoveCtl.y = rectParent.bottom-rectParent.top;
ptMoveCtl.x = 0;
} }
/* Set the new size of the window from the extra space needed */
SetRect(&rectParent,rectParent.left,rectParent.top,rectParent.left+ptParentClient.x,rectParent.top+ptParentClient.y);
AdjustWindowRectEx( &rectParent,GetWindowLongA(hwndParentDlg,GWL_STYLE),FALSE,GetWindowLongA(hwndParentDlg,GWL_EXSTYLE));
SetWindowPos(hwndChildDlg, 0, 0,0, ptParentClient.x,ptParentClient.y, SWP_NOZORDER ); /* finally use fixed parent size */
SetWindowPos(hwndParentDlg, 0, rectParent.left,rectParent.top, (rectParent.right- rectParent.left), rectParent.bottom -= help_fixup;
(rectParent.bottom-rectParent.top),SWP_NOMOVE | SWP_NOZORDER);
/*
This part moves the child components below the file dialog box if stc32 is not present
and place them accordinf to stc32 if it is present.
*/
hwndChild = GetWindow(hwndChildDlg,GW_CHILD);
if (hwndChild )
{
do
{
if(hwndChild != hwndStc32)
{
if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
continue;
GetWindowRect(hwndChild,&rectCtrl);
MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
/*
If stc32 is present, moves the child components as required.
*/
if ((rectCtrl.left >= rectTemp.right) && ((rectCtrl.left+ptMoveCtl.x)<rectParent.right)){
rectCtrl.left += ptMoveCtl.x;
rectCtrl.right +=ptMoveCtl.x;
}
if ((rectCtrl.top >= rectTemp.bottom) && ((rectCtrl.top+ptMoveCtl.y)<rectParent.bottom)){
rectCtrl.top += ptMoveCtl.y;
rectCtrl.bottom += ptMoveCtl.y;
}
SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
SWP_NOSIZE | SWP_NOZORDER );
}
} while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != NULL);
}
/* /* set the size of the child dialog */
This part moves the components of the default file dialog box according to the stc32 coordinates. SetWindowPos(hwndChildDlg, HWND_BOTTOM,
*/ 0, 0, rectParent.right, rectParent.bottom, SWP_NOACTIVATE);
hwndChild = GetWindow(hwndParentDlg,GW_CHILD);
if(hwndStc32)
{
GetWindowRect(hwndStc32,&rectStc32);
MapWindowPoints( 0, hwndChildDlg,(LPPOINT)&rectStc32,2);
ptMoveCtl.x = rectStc32.left - 0;
ptMoveCtl.y = rectStc32.top - 0;
if (hwndChild )
{
do
{
if(hwndChild != hwndChildDlg)
{
if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
continue;
GetWindowRect(hwndChild,&rectCtrl);
MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
rectCtrl.left += ptMoveCtl.x; /* set the size of the parent dialog */
rectCtrl.right += ptMoveCtl.x; AdjustWindowRectEx(&rectParent, GetWindowLongW(hwndParentDlg, GWL_STYLE),
rectCtrl.top += ptMoveCtl.y; FALSE, GetWindowLongW(hwndParentDlg, GWL_EXSTYLE));
rectCtrl.bottom += ptMoveCtl.y; SetWindowPos(hwndParentDlg, 0,
0, 0,
SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, rectParent.right - rectParent.left,
rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top, rectParent.bottom - rectParent.top,
SWP_NOSIZE |SWP_NOZORDER ); SWP_NOMOVE | SWP_NOZORDER);
}
} while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != NULL);
}
}
} }
INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(GetParent(hwnd),FileOpenDlgInfosStr); FileOpenDlgInfos *fodInfos;
#if 0 #if 0
TRACE("0x%04x\n", uMsg); TRACE("0x%04x\n", uMsg);
@ -650,32 +675,8 @@ INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
/* Hide caption since some program may leave it */
DWORD Style = GetWindowLongA(hwnd, GWL_STYLE);
if (Style & WS_CAPTION) SetWindowLongA(hwnd, GWL_STYLE, Style & (~WS_CAPTION));
fodInfos = (FileOpenDlgInfos *)lParam; fodInfos = (FileOpenDlgInfos *)lParam;
lParam = (LPARAM) fodInfos->ofnInfos; lParam = (LPARAM) fodInfos->ofnInfos;
ArrangeCtrlPositions(hwnd,GetParent(hwnd));
/* If the help button and the readonly button are hidden
we have to resize the dialog before calling the hook procedure
because some apps use the size to resize the window.
*/
if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
(!(fodInfos->ofnInfos->Flags &
(OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))))
{
RECT rectDlg, rectHelp, rectCancel;
GetWindowRect(hwnd, &rectDlg);
GetWindowRect(GetDlgItem(hwnd, pshHelp), &rectHelp);
GetWindowRect(GetDlgItem(hwnd, IDCANCEL), &rectCancel);
/* subtract the height of the help button plus the space between
the help button and the cancel button to the height of the dialog */
SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left,
(rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom),
SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
}
if(fodInfos && IsHooked(fodInfos)) if(fodInfos && IsHooked(fodInfos))
return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam); return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
@ -683,10 +684,11 @@ INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam
} }
} }
fodInfos = (FileOpenDlgInfos *) GetPropA(GetParent(hwnd),FileOpenDlgInfosStr);
if(fodInfos && IsHooked(fodInfos)) if(fodInfos && IsHooked(fodInfos))
return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam); return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
return DefWindowProcA(hwnd,uMsg,wParam,lParam); return 0;
} }
HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
@ -703,8 +705,7 @@ HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
* structure's hInstance parameter is not a HINSTANCE, but * structure's hInstance parameter is not a HINSTANCE, but
* instead a pointer to a template resource to use. * instead a pointer to a template resource to use.
*/ */
if (fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATE || if (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))
fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATEHANDLE)
{ {
HINSTANCE hinst; HINSTANCE hinst;
if (fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATEHANDLE) if (fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATEHANDLE)
@ -741,7 +742,7 @@ HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
return NULL; return NULL;
} }
} }
hChildDlg= CreateDialogIndirectParamA(hinst, template, hChildDlg= CreateDialogIndirectParamA(COMDLG32_hInstance, template,
hwnd, FileOpenDlgProcUserTemplate, (LPARAM)fodInfos); hwnd, FileOpenDlgProcUserTemplate, (LPARAM)fodInfos);
if(hChildDlg) if(hChildDlg)
{ {
@ -757,16 +758,16 @@ HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
WORD menu,class,title; WORD menu,class,title;
} temp; } temp;
GetClientRect(hwnd,&rectHwnd); GetClientRect(hwnd,&rectHwnd);
temp.tmplate.style = WS_CHILD | WS_CLIPSIBLINGS; temp.tmplate.style = WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE | DS_CONTROL | DS_3DLOOK;
temp.tmplate.dwExtendedStyle = 0; temp.tmplate.dwExtendedStyle = 0;
temp.tmplate.cdit = 0; temp.tmplate.cdit = 0;
temp.tmplate.x = 0; temp.tmplate.x = 0;
temp.tmplate.y = 0; temp.tmplate.y = 0;
temp.tmplate.cx = rectHwnd.right-rectHwnd.left; temp.tmplate.cx = 0;
temp.tmplate.cy = rectHwnd.bottom-rectHwnd.top; temp.tmplate.cy = 0;
temp.menu = temp.class = temp.title = 0; temp.menu = temp.class = temp.title = 0;
hChildDlg = CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&temp.tmplate, hChildDlg = CreateDialogIndirectParamA(COMDLG32_hInstance, &temp.tmplate,
hwnd, FileOpenDlgProcUserTemplate, (LPARAM)fodInfos); hwnd, FileOpenDlgProcUserTemplate, (LPARAM)fodInfos);
return hChildDlg; return hChildDlg;
@ -799,6 +800,7 @@ HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode)
ofnNotify.hdr.idFrom=0; ofnNotify.hdr.idFrom=0;
ofnNotify.hdr.code = uCode; ofnNotify.hdr.code = uCode;
ofnNotify.lpOFN = fodInfos->ofnInfos; ofnNotify.lpOFN = fodInfos->ofnInfos;
ofnNotify.pszFile = NULL;
TRACE("CALL NOTIFY for %x\n", uCode); TRACE("CALL NOTIFY for %x\n", uCode);
ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify); ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
TRACE("RET NOTIFY\n"); TRACE("RET NOTIFY\n");
@ -929,11 +931,13 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
FILEDLG95_InitControls(hwnd); FILEDLG95_InitControls(hwnd);
FILEDLG95_FillControls(hwnd, wParam, lParam); FILEDLG95_FillControls(hwnd, wParam, lParam);
if (fodInfos->DlgInfos.hwndCustomDlg)
ArrangeCtrlPositions(fodInfos->DlgInfos.hwndCustomDlg, hwnd,
(fodInfos->ofnInfos->Flags & (OFN_HIDEREADONLY | OFN_SHOWHELP)) == OFN_HIDEREADONLY);
SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE);
SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE);
SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE);
SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM,
0,0,0,0, SWP_NOMOVE|SWP_NOSIZE);
return 0; return 0;
} }
case WM_COMMAND: case WM_COMMAND:
@ -1069,12 +1073,10 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
rectTB.top = rectlook.top-1; rectTB.top = rectlook.top-1;
fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL,
WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMDLG32_hInstance, NULL); rectTB.left, rectTB.top,
rectTB.right - rectTB.left, rectTB.bottom - rectTB.top,
SetWindowPos(fodInfos->DlgInfos.hwndTB, 0, hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL);
rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top,
SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER );
SendMessageA(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0); SendMessageA(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
@ -1264,6 +1266,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
TRACE("No initial dir specified, using current dir of %s\n", debugstr_w(fodInfos->initdir)); TRACE("No initial dir specified, using current dir of %s\n", debugstr_w(fodInfos->initdir));
} }
} }
SetFocus(GetDlgItem(hwnd, IDC_FILENAME));
TRACE("After manipulation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); TRACE("After manipulation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir));
/* Must the open as read only check box be checked ?*/ /* Must the open as read only check box be checked ?*/
@ -1272,16 +1275,18 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
SendDlgItemMessageA(hwnd,IDC_OPENREADONLY,BM_SETCHECK,(WPARAM)TRUE,0); SendDlgItemMessageA(hwnd,IDC_OPENREADONLY,BM_SETCHECK,(WPARAM)TRUE,0);
} }
/* Must the open as read only check box be hid ?*/ /* Must the open as read only check box be hidden? */
if(fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) if(fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY)
{ {
ShowWindow(GetDlgItem(hwnd,IDC_OPENREADONLY),SW_HIDE); ShowWindow(GetDlgItem(hwnd,IDC_OPENREADONLY),SW_HIDE);
EnableWindow(GetDlgItem(hwnd, IDC_OPENREADONLY), FALSE);
} }
/* Must the help button be hid ?*/ /* Must the help button be hidden? */
if (!(fodInfos->ofnInfos->Flags & OFN_SHOWHELP)) if (!(fodInfos->ofnInfos->Flags & OFN_SHOWHELP))
{ {
ShowWindow(GetDlgItem(hwnd, pshHelp), SW_HIDE); ShowWindow(GetDlgItem(hwnd, pshHelp), SW_HIDE);
EnableWindow(GetDlgItem(hwnd, pshHelp), FALSE);
} }
/* Resize the height, if open as read only checkbox ad help button /* Resize the height, if open as read only checkbox ad help button

2
dlls/commdlg/filedlgbrowser.h
View File

@ -139,7 +139,7 @@ typedef struct
#define IDC_FILENAME edt1 #define IDC_FILENAME edt1
#define IDC_TOOLBAR ctl1 #define IDC_TOOLBAR 1
/*********************************************************************** /***********************************************************************
* Prototypes for the methods of the IShellBrowserImpl class * Prototypes for the methods of the IShellBrowserImpl class