Commit Graph

225 Commits

Author SHA1 Message Date
Lei Zhang e3b80a0d88 comctl32: Determine if PSH_PROPSHEETPAGE is set once. 2007-06-26 12:12:36 +02:00
Lei Zhang f4dd14abc6 comctl32: Reduce duplicate code between PROPSHEET_CollectSheetInfoA/W. 2007-06-26 12:12:25 +02:00
Lei Zhang 0cbee494b3 comctl32: Reduce duplicate code between PropertySheetA/W. 2007-06-26 12:12:12 +02:00
Lei Zhang ebb460c3c0 comctl32: Make modal property sheets modal. 2007-06-15 13:24:13 +02:00
Dmitry Timoshkov 3c9e7a7f33 wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility. 2007-05-25 20:37:56 +02:00
Aric Stewart 5688ffb7ab comctl32: Propsheet exception fix.
Do not attempt to draw a page during WM_PAINT if there is no active page.
2007-04-04 16:16:53 +02:00
Aric Stewart 2a8463b558 comctl32: Unset active page while setting a new active page for a propsheet.
Before calling the PSN_SETACTIVE in PROPSHEET_SetCurSel set the
active_page to -1. This prevents crashes and corruption of the
property sheet if the application makes any modifications during the
PSN_SETACTIVE.
2007-04-02 12:09:19 +02:00
Andrew Talbot abf4d3b8cd comctl32: Constify some variables. 2007-04-02 11:37:03 +02:00
Michael Stefaniuc 22ecd7aa67 comctl32: Remove redundant NULL checks before Free() (found by Smatch). 2007-03-08 11:58:04 +01:00
Felix Nawothnig 8784d47cba comctl32: Remove redundant NULL checks before Free() calls. 2007-02-14 12:22:39 +01:00
Francois Gouget aab5e5856e Don't put single quotes around '%s' when using the debugstr_*() functions. 2007-01-18 12:55:50 +01:00
Detlef Riekenberg e089659af1 comctl32: Do not crash when the startpage is invalid. 2006-12-01 13:12:00 +01:00
Andrew Talbot 63246a5396 comctl32: Cast-qual warnings fix. 2006-11-29 12:36:47 +01:00
Huw Davies a6e2fe5ae3 comctl32: Set the result to IDOK on 'Finish'. 2006-11-21 12:13:58 +01:00
Huw Davies c18af414e5 comctl32: Implement PSM_GETRESULT. 2006-11-02 21:00:55 +01:00
Huw Davies 6d0b86a92b comctl32: Fix return value of PropertySheet() for modal propsheets. 2006-11-02 21:00:51 +01:00
Michael Ploujnikov 1c16d83379 comctl32: Win64 printf format warning fixes. 2006-10-14 20:17:06 +02:00
James Hawkins cd073a66a5 comctl32: Make internal functions static. 2006-10-12 11:35:05 +02:00
Andrew Talbot cc90540c9b comctl32: Cast-qual warnings fix. 2006-09-07 10:16:34 +02:00
Huw Davies 650c9c42de comctl32: Limit the width of the watermark to 164 pixels. 2006-08-01 18:41:59 +02:00
Huw Davies 608ddd4742 comctl32: Limit the size of the header bitmap to 49x49. 2006-08-01 18:41:48 +02:00
Huw Davies d1be762464 comctl32: Invalidate the header area so that updated titles will be drawn. 2006-08-01 18:41:40 +02:00
Huw Davies 12c0da6815 comctl32: Wordwrap the sub title. 2006-08-01 18:41:35 +02:00
Huw Davies 64ddc97b09 comctl32: The titles are already converted to unicode so always use DrawTextW to write them. 2006-08-01 18:41:01 +02:00
Mikołaj Zalewski 7ce1bb89b9 comctl32: Use wsprintf instead of strcat building the properties
dialog title to allow different word orders.
2006-07-12 19:28:17 +02:00
Alexandre Julliard 03e2b335c4 comctl32: Don't use sizeof in traces to avoid printf format warnings. 2006-06-13 14:09:16 +02:00
Dmitry Timoshkov 217dae68c5 comctl32: Return FALSE in the WM_CLOSE PROPSHEET_DialogProc handler.
Return FALSE in the WM_CLOSE PROPSHEET_DialogProc handler in order to
allow DefDlgProc to post us WM_COMMAND/IDCANCEL and unblock modal
message loop.
2006-06-09 13:26:31 +02:00
Dmitry Timoshkov b4d5dd5efa comctl32: Remove WM_SYSCOMMAND handler from PROPSHEET_DialogProc. 2006-06-07 11:48:21 +02:00
Alexandre Julliard 1d40bf0141 comctl32: propsheet: Fixed buffer sizes for LoadStringW. 2006-05-30 20:01:19 +02:00
Robert Shearman f5660c23ae comctl32: Fix the loading of strings for the property sheet page by
caching the ID of the string to load before overwriting it with an
Alloc call.
2006-05-23 20:52:56 +02:00
Jonathan Ernst 360a3f9142 Update the address of the Free Software Foundation. 2006-05-23 14:11:13 +02:00
Robert Shearman a247e6975f comctl32: Make sure to always have the default pushbutton for wizards as an enabled button. 2006-05-22 11:28:52 +02:00
Robert Shearman 2682ff43d0 comctl32: A PSM_SETWIZBUTTONS message specifying PSWIZB_FINISH or
PSWIZB_DISABLEDFINISH, followed by another one without those flags
should show the next button again and hide the finish button.
2006-05-22 11:28:45 +02:00
Dmitry Timoshkov 154e54e8e6 comctl32: Make some internal functions and variables static, remove
some unneeded prototypes.
2006-05-08 13:38:35 +02:00
Dmitry Timoshkov 308813112e comctl32: Add support for PSP_USEHEADERTITLE, PSP_USEHEADERSUBTITLE
and PSP_HIDEHEADER in CreatePropertySheetPageA/W, handle resource ids.
2006-05-08 13:38:19 +02:00
Dmitry Timoshkov 34cf29efbb comctl32: psInfo->proppage[index].pszText is always initialized to a
proper value regardless of PSP_USETITLE, use it unconditionally.
2006-05-08 13:38:00 +02:00
Huw Davies 517b85f989 comctl32: Set the sheet caption before invoking the sheet callback and before creating the pages. 2006-04-06 22:22:00 +02:00
Thomas Weidenmueller 3faa66ee2a comctl32: Fix error handling in PSM_ADDPAGE in case of memory
allocation failure.
2005-12-31 13:12:19 +01:00
Michael Kaufmann e9310da57b Handle WM_PRINTCLIENT.
Don't use SelectClipRgn in WM_PRINTCLIENT.
2005-11-08 12:52:35 +00:00
Marcus Meissner bd7ec9aca5 The last argument to MultiByteToWideChar is wide character count and
not the buffer size in bytes. Fixed all places where it was wrong.
2005-09-12 22:07:53 +00:00
Frank Richter 9e57091ffa Fix warnings in 64bit. 2005-08-30 10:07:17 +00:00
Thomas Weidenmueller c9b7442689 It should be allowed to pass NULL handles in the phpage array of the
PROPSHEETHEADER structure to PropertySheet(), just ignore them.
2005-08-27 09:59:09 +00:00
Frank Richter 5c3f6bcd44 Enabled "tab" dialog texture for property sheet pages. 2005-07-18 10:31:06 +00:00
Thomas Weidenmueller 2e7f3ad702 Support PSM_IDTOINDEX. 2005-07-15 11:42:18 +00:00
Thomas Weidenmueller 6ea26b50a9 - Support PSH_WIZARDHASFINISH in wizards.
- Correct tab order of the wizard buttons.
2005-07-15 09:59:04 +00:00
Felix Nawothnig bd8790bee4 Don't invalidate the whole propsheet when the page is switched. 2005-07-06 19:03:33 +00:00
Frank Richter c81d46d77f Let property sheets update the cached system colors upon receiving
WM_SYSCOLORCHANGE.
2005-07-05 10:57:37 +00:00
Huw Davies 2e301ceb1c For modal propsheets we should run our own message loop rather than
use a modal dialogbox just like Windows does.  This helps apps that
subclass the propsheet's wndproc.
2005-06-15 19:12:57 +00:00
Mike McCormack 882bc4d18d Warning fixes for -Wmissing-declarations and -Wwrite-strings. 2005-06-09 09:50:56 +00:00
Dimitrie O. Paun 8df71a6cfa Use {Alloc,ReAlloc,Free}() instead of Heap{Alloc,ReAlloc,Free}(). 2005-03-25 20:49:00 +00:00
Dimitrie O. Paun b1d65cb15d Handle wParam in WM_PAINT properly: if non-null, it is the hdc we are
supposed to use to draw into.
2005-03-25 10:26:10 +00:00
Jakob Eriksson 9ed61de9a2 Get rid of HeapAlloc casts. 2005-03-24 21:01:35 +00:00
Dimitrie O. Paun 2fbd839e90 Complete unicodification of the propsheet common control. 2005-03-23 10:23:23 +00:00
Eric Pouech cf1d00bb08 Removed excessive statement (break after return or goto, not useful
break, not needed vars...)
2005-01-09 16:42:53 +00:00
Aric Stewart 764ff272d6 Check to make sure PropSheetInfo* is not null before dereferencing it
for some windows messages.
2004-10-04 20:39:55 +00:00
Filip Navara 67c8cb28f9 - Implement PSM_INDEXTOID, PSM_INDEXTOPAGE and PSM_PAGETOINDEX messages.
- Partially implement the PSH_WIZARDCONTEXTHELP and PSH_NOCONTEXTHELP
  styles.
2004-09-20 19:13:36 +00:00
Filip Navara 99423d4e48 Status update. 2004-09-14 01:06:44 +00:00
Filip Navara 043e27523d Fix resizing of wizards. 2004-09-13 23:19:51 +00:00
Filip Navara 8a8a66c328 Fill the area next to watermark bitmap with window color and subclass
exterior wizard pages to suppress drawing background.
2004-09-13 19:17:00 +00:00
Filip Navara 4387895d86 Correct displaying of wizard subtitle. 2004-09-13 18:02:32 +00:00
Filip Navara 3b0aaea137 Do not distinguish exterior wizard pages by their position, but
instead expect that every page in wizard that doesn't have header is
exterior.
2004-09-08 21:47:03 +00:00
Filip Navara 32b23b3419 - Revert incorrect change to tab control resizing from revision 1.109.
- Move the property sheet resizing code from PROPSHEET_CreatePage to
  PROPSHEET_SetCurSel. It needs to be executed on every page change
  because the application can modify it during the notifications.
2004-09-07 20:28:14 +00:00
Filip Navara 002d91199a - Draw the Wizard97 header bitmaps before drawing the header strings.
- Center the header bitmap of the new Wizard97 correctly.
- Display the correct wizard title for any wizard type and do not
  change it for reqular property sheets.
2004-09-07 19:31:50 +00:00
Filip Navara 335983ed91 Fix loading wizard title and subtitle from resources. 2004-08-30 18:39:32 +00:00
Mike McCormack 8b424416bb Calculate the correct size of dialog templates in the propsheet
control.
2004-08-26 18:11:43 +00:00
Robert Shearman cdb263e588 Replace GetWindowLong by GetWindowLongPtr. 2004-08-25 17:33:01 +00:00
Mike McCormack 90c25514fe Adjust the tab contents to fix the propsheet between PSM_KILLACTIVE
and PSM_SETACTIVE.
2004-08-23 17:51:19 +00:00
Robert Shearman ab7bad7647 Always redraw dialog on changing between pages. 2004-08-17 22:09:02 +00:00
Zach Gorman 9b68d0f993 OK button should be default in non-wizard property sheets. 2004-08-16 23:17:44 +00:00
Zach Gorman be3d4071bf Propsheet pages need WS_EX_CONTROLPARENT style. 2004-08-16 19:50:44 +00:00
Filip Navara 9a0f5ede42 Use correct dialog title for Wizard 97 and correctly display header
bitmap for old-style Wizard 97.
2004-08-09 22:54:14 +00:00
Eric Kohl bea0555890 Move watermark and header bitmap loading code from
PROPSHEET_CreatePage into its own function PROPSHEET_LoadWizardBitmaps
and call this function from property sheet's dialog procedure.
2004-08-09 19:48:04 +00:00
Marcus Meissner e5a5e7271d Implemented PSM_INDEXTOHWND. 2004-08-02 18:24:58 +00:00
Filip Navara c846f88fa2 - Properly calculate caption length when converting multi-byte string
to wide character one.
- Wizard contents shouldn't be moved by the size of watermark bitmap.
- Fix PSH_WIZARD97_[NEW/OLD] checks.
- Blit the watermark even if PSH_USEHBMWATERMARK flag isn't set and
  blit only the part that fits into the dialog.
2004-07-21 21:17:59 +00:00
Robert Shearman 0d9f93ab06 Implemented PSM_HWNDTOINDEX. 2004-07-12 23:48:11 +00:00
Robert Shearman cd2065f170 Add stubs for some new property sheet messages. 2004-07-12 23:30:54 +00:00
Maxime Bellengé d19e264640 Implemented PSH_WIZARD97_OLD and PSH_WIZARD97_NEW property sheet
styles.
2004-05-10 21:26:04 +00:00
Francois Gouget ebf0eb3138 Make static Unicode strings const. 2004-04-20 00:34:52 +00:00
Juan Lang 9a3647a303 Prevent negative coords for line, turn off redraw when initializing,
document one difference in native/builtin behavior.
2004-03-13 19:24:04 +00:00
Robert Shearman 57cc6f58ba Update common control function documentation. 2004-02-27 04:40:08 +00:00
Matt Chapman c286ca06a0 Fix a reentrancy issue in the property sheet implementation by not
caching a pointer that can change.
2004-02-25 01:24:22 +00:00
Ulrich Czekalla 710bd6fb6a We should forward WM_COMMAND notification to the active page for any
additional non-standard controls in the property sheet frame.
2004-01-27 20:11:05 +00:00
Francois Gouget 6b6ed724ae Add missing '\n's to debug traces. 2004-01-27 00:01:43 +00:00
Huw Davies e63e39f2c5 PropSheetPageProc callback should always have hwnd = 0. 2003-11-04 04:23:00 +00:00
Huw Davies f94159cdb2 Don't get confused if PSN_SETACTIVE returns a positive number that
isn't a resource id.
2003-11-03 22:15:39 +00:00
Pavel Roskin 5b7f03cf9f Ignore window caption from PROPSHEETHEADER in wizards. Update window
caption when changing pages.
2003-10-02 04:26:53 +00:00
Dimitrie O. Paun 7de279a73a Rename COMCTL32_{Alloc,ReAlloc,Free} to {Alloc,ReAlloc,Free}. 2003-09-22 21:32:33 +00:00
Alexandre Julliard cf52644a1c Removed the A/W constants for builtin cursors, icons and resource
types since they don't exist on Windows, and added typecasts
everywhere instead.
2003-09-10 03:56:47 +00:00
Alexandre Julliard e37c6e18d0 Fixed header dependencies to be fully compatible with the Windows
headers (with help from Dimitrie O. Paun).
2003-09-05 23:08:26 +00:00
Mike McCormack ec0d425278 Set defaults for the Next/Prev button. 2003-07-21 20:01:59 +00:00
Mike McCormack fc86392af8 Preserve A/W when creating propsheet dialogs. 2003-07-09 02:49:52 +00:00
Francois Gouget 9591836ffb 'sizeof type' is best avoided as it won't always compile (e.g. 'int
main() {return sizeof int;}'). Use 'sizeof(type)' instead.
2003-06-18 19:45:22 +00:00
Adam Gundy 1af319d9e2 PROPSHEET_CreateDialog() is documented to return -1 on failure, and
the dialog handle on success.
2003-03-07 20:29:58 +00:00
Eric Pouech a89063e3dc Added handling for PSNRET_INVALID in PSN_APPLY notification. 2003-02-24 20:40:45 +00:00
Alexandre Julliard 43690e9e47 Removed no longer needed inclusion of heap.h. 2003-01-24 00:54:58 +00:00
Dan Kegel 0fd521fee3 Change RECT to use LONG to match win32 standard headers and fix format
strings to use %ld for RECT elements.
2003-01-08 21:09:25 +00:00
Dimitrie O. Paun 297f3d898d Define NONAMELESS{STRUCT,UNION} explicitly in the files that need them. 2003-01-07 20:36:20 +00:00
Lionel Ulmer 5e36ae56b2 Check the value of the pfnCallback in addition to the callback bit. 2003-01-03 03:06:42 +00:00
Rolf Kalbermatter 6c79930413 Add config.h/port.h to allow compilation/linking in MSVC.
Fix some unsigned/signed warnings.
2002-12-16 22:43:58 +00:00
Francois Gouget 3db0008552 Define PSH_WIZARD97 (problem reported by jaymz@free.fr). 2002-12-06 23:19:54 +00:00