Applied patch [ 602924 ] colours and effects in wxMSW::wxFontDialog

wxFontDialog effects only turned on if a valid colour was
provided in wxFontData

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index eab31c77a977c9643b139dcd7fb17a76f4fe030b..32b73af0a405ec2fbd78267f0d972df19ffb9e99 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -49,9 +49,6 @@ wxBase:
   must modify YourApp::OnAssert() signature if you were using it to override
   the default assert handling.
 
   must modify YourApp::OnAssert() signature if you were using it to override
   the default assert handling.
 

-- IPC classes improved and memory leaks fixed (Michael Fielding).
-  Global buffer removed, duplication in docs removed.
-

 All (GUI):
 
 ! the event type constants are not constants any more but are dynamically
 All (GUI):
 
 ! the event type constants are not constants any more but are dynamically


@@ -193,6 +190,8 @@ wxBase:
   deprecated)
 - added wxShutdown() function (Marco Cavallini)
 - added wxEXPLICIT macro
   deprecated)
 - added wxShutdown() function (Marco Cavallini)
 - added wxEXPLICIT macro

+- IPC classes improved and memory leaks fixed (Michael Fielding).
+  Global buffer removed, duplication in docs removed

 
 Unix (Base/GUI):
 
 
 Unix (Base/GUI):
 


@@ -279,6 +278,8 @@ wxMSW:
 - fixed a condition where a thread can hang during message/event processing
 - increased space between wxRadioBox label and first radio button
 - don't fail to register remaining window classes if one fails to register
 - fixed a condition where a thread can hang during message/event processing
 - increased space between wxRadioBox label and first radio button
 - don't fail to register remaining window classes if one fails to register

+- wxFontDialog effects only turned on if a valid colour was
+  provided in wxFontData

 
 wxGTK:
 
 
 wxGTK:
 

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 3c46f26ba2d9bac7d67704f9c23a22fa72d409b6..3eabda7f5099ffbf3ca65d27071a964644109bcf 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -158,7 +158,7 @@ void wxColourData::operator=(const wxColourData& data)
 wxFontData::wxFontData()
 {
     // Intialize colour to black.
 wxFontData::wxFontData()
 {
     // Intialize colour to black.

-    fontColour.Set(0, 0, 0);
+    fontColour = wxNullColour;

 
     showHelp = FALSE;
     allowSymbols = TRUE;
 
     showHelp = FALSE;
     allowSymbols = TRUE;