Commit Graph

185 Commits

Author SHA1 Message Date
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
Andreas Mohr 1e6258fca5 Added the missing cx member to the MyDLGITEMTEMPLATEEX struct. 2002-11-25 02:45:19 +00:00
Dmitry Timoshkov 601a3abec1 Fix some types and function prototypes according to Platform SDK
definitions.
2002-10-31 01:04:39 +00:00
Michael Stefaniuc 353529b2c8 - fix the "int format, HANDLE arg" type of warnings for comctl32
- compile the comctl32 dll with -DSTRICT
2002-10-23 22:19:10 +00:00
Michael Stefaniuc f3d1893f80 Add needed casts for a "no warnings" compile of comctl32. 2002-10-23 20:19:22 +00:00
Uwe Bonnes e14cfc497a Add function to get size of in-memory resource and used this function
to copy resource to writable memory.
2002-10-13 17:54:48 +00:00
Michael Stefaniuc bc54d78532 - change the internal functions in windows/cursoricon.c to use 32bit
handles
- move the implementation of ExtractAssociatedIcon16 to
  ExtractAssociatedIconA
- convert HICON to a void*
- fixed some handle conversions that happened to be in the way while
  doing the above
2002-10-10 21:22:09 +00:00
Michael Stefaniuc 025c0b716b Prepare dlls/{comctl32,gdi,msvideo,setupapi,shell32,twain,winmm} for
the conversion of HWND to a void*.
2002-09-06 19:41:17 +00:00
Andriy Palamarchuk a6affaa014 Implemented processing of PSM_SETCURSELID message. 2002-08-26 21:47:06 +00:00
Patrik Stridvall 4325554aef Fixed some issues found by winapi_check. 2002-08-09 01:07:29 +00:00
Guy L. Albertelli 176f5cf62c Add TCM_SETCURSEL when setting page current. 2002-06-28 17:31:57 +00:00
Guy L. Albertelli 6c7769e488 Support images on the tabs of pages that are added (not just the
first).
2002-06-14 23:26:37 +00:00
Guy L. Albertelli f9731a4ee7 - Correct page rectangle calculation.
- Improve traces.
2002-06-13 19:10:28 +00:00
Vincent Béron 9a62491660 Removed trailing whitespace. 2002-05-31 23:06:46 +00:00
Maciek Kaliszewski 2ad82e119e Fixed memory allocation bug in PROPSHEET_CollectPageInfo. 2002-05-28 22:41:19 +00:00
Sander van Leeuwen d919c27a97 - Center property sheet page during creation (padding)
(some applications rely on this behaviour when resizing the page)
- Mask away WS_THICKFRAME page style
- Page navigation by resource id (by unknown author)
2002-05-14 18:38:07 +00:00
Guy L. Albertelli 7f9baba139 Fixed issues with Unicode conversion. Certain strings were not
converted, but then processed as converted.
2002-05-14 03:48:48 +00:00
Dimitrie O. Paun 00df897119 Fix two compilation warnings. 2002-04-02 19:16:08 +00:00
Alexandre Julliard 0799c1a780 Added LGPL standard comment, and copyright notices where necessary.
Global replacement of debugtools.h by wine/debug.h.
2002-03-09 23:29:33 +00:00
Alexandre Julliard d328085efa Authors: Guy Albertelli <guy@codeweavers.com>, Mike McCormack <mike_mccormack@start.com.au>
Property sheet Unicodification.
Support additional wizard flags.
2002-01-29 17:14:53 +00:00
Lawson Whitney a77f8d374c If there is no psInfo, it doesn't need to be cleaned up. 2001-12-19 18:46:49 +00:00
Andreas Mohr c457fbdde6 Fixed tab control index handling. 2001-08-06 17:51:09 +00:00
Marcus Meissner 40734af751 Be a bit more graceful on NULL property sheet titles. 2001-07-26 20:07:53 +00:00
Alexandre Julliard 5f728cae70 Removed HEAP_strdupA. 2001-07-24 21:45:22 +00:00
Patrik Stridvall 6076729649 Documentation ordinal fixes. 2001-06-19 03:34:07 +00:00
Marcus Meissner decd475621 Implemented page skipping on PSN_SETACTIVE -1 return. 2001-06-06 21:03:21 +00:00
Andreas Mohr 9f05b8229f Check PROPSHEETPAGEA.pfnCallback for NULL pointer if PSP_USECALLBACK
is given.
2001-02-12 18:08:31 +00:00
François Gouget 16baace694 Only copy the dwSize bytes really occupied by lpPropSheetPage. 2001-01-10 22:42:58 +00:00
Andreas Mohr a6d83ebae1 - clarify many error messages
- add data corruption warning to README file
2000-12-27 04:02:46 +00:00
Alexandre Julliard 49556bcbf5 Cleaned up some more dependencies on Wine internal functions. 2000-11-29 18:38:24 +00:00
Dimitrie O. Paun 529da54394 Require {DECLARE,DEFAULT}_DEBUG_CHANNEL statements to end in a ; 2000-11-27 23:54:25 +00:00
Dmitry Timoshkov 99653905ec Make a copy of the dialog resource before correcting styles. 2000-11-09 20:25:27 +00:00
Peter Hunnisett 565b00857e - Added some missing WINELIB_NAME_AW definitions, types and messages
- Small prototype fixes
2000-09-19 02:43:00 +00:00
Andreas Mohr d511177390 "Fixed" horribly misaligned pages in property sheets of apparently
newer InstallShields.
2000-08-26 20:28:02 +00:00
Gerard Patel f314e5e76b Disable the owner of a modal dialog box just before creating the
dialog window.
2000-08-21 03:31:39 +00:00
Slava Monich 5b0ace1c24 On Windows property sheet has DWL_USER dword pointing to a structure
that starts with HWND and PROPSHEETHEADER fields.
2000-07-08 12:48:13 +00:00
Noomen Hamza 6ce34254d0 The active page should be unchanged when removing an active first page
from a property sheets.
2000-06-07 02:01:28 +00:00
Patrik Stridvall 2d6457c11a Added/fixed some documentation reported by winapi_check. 2000-03-28 20:22:59 +00:00
Jim Aston fd018cc9da This reverts Matts patch. The messaging needs double checking. 2000-02-26 18:28:38 +00:00
Serge Ivanov c0b824d7de In Windows, if PropertySheet can't create some page it just skips it. This
patch adds similar behaviour to Wine. It also adds some NULL checks.

<yuxi@corel.com>
Fix property sheet initialization bugs.

Matthew Robertson
The template was calling GetActiveIndex which was not being set in the
propsheet code, and the call was moved before we call SetActive -
because that's where we query for the Active Index.

Noomen Hamza
Resize property sheet to the largest dialog size.

Don Kelly
In the WM_INITDIALOG handler for the prop sheet, there is a call to
PROPSHEET_IsTooSmall() which, if it returns TRUE, calls
PROPSHEET_AdjustSize().  Contrary to its comment, .._AdjustSize() actually
aligns the sizes of the "largest" prop. sheet dialog template and the tab
control.  The IsTooSmall() call doesn't properly catch this mismatch.
Modified the function to return TRUE if the sizes mismatch and renamed it to
PROPSHEET_SizeMismatch() to reflect its proper use.
2000-02-25 20:49:49 +00:00
Alexandre Julliard 08afc1a5ed Serge Ivanov
Pierre Mageau
Thy Nguyen
Don Kelly
Noomen Hamza
Lots of bug fixes and new features in property sheets.
1999-11-28 21:01:47 +00:00