wxChoice/wxComboBox background colour change (to get back to where we were);

and .dsp file updates

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

diff --git a/docs/latex/wx/texpr.tex b/docs/latex/wx/texpr.tex
index 0cf364f452d6dbb87ea21357390e8debe02721a8..70a01967b0f76dceab4f517d46f1b0094e6780f6 100644 (file)
--- a/docs/latex/wx/texpr.tex
+++ b/docs/latex/wx/texpr.tex
@@ -130,10 +130,10 @@ depending on what the version of FLEX expects. See the bottom of
 parser.y, and if necessary edit it to make it compile in the opposite
 way to the current compilation.
 
 parser.y, and if necessary edit it to make it compile in the opposite
 way to the current compilation.
 

-To test out wxExpr compile the test program (samples/wxexpr/wxexpr.exe),
-and try loading test.exp into the test
-program. Then save it to another file. If the second is identical to the
-first, wxExpr is in a working state.
+%To test out wxExpr compile the test program (samples/wxexpr/wxexpr.exe),
+%and try loading test.exp into the test
+%program. Then save it to another file. If the second is identical to the
+%first, wxExpr is in a working state.

 
 \subsection{Bugs}
 
 
 \subsection{Bugs}
 

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index fe11b93585cb05c60348cdf7e907e986923ad159..3dddc4177e9728509dd05904e740460f156f1b7b 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -71,6 +71,7 @@ wxBitmapRefData::wxBitmapRefData()
     m_selectedInto = NULL;
     m_numColors = 0;
     m_bitmapMask = NULL;
     m_selectedInto = NULL;
     m_numColors = 0;
     m_bitmapMask = NULL;

+    m_hBitmap = (WXHBITMAP) NULL;

 }
 
 void wxBitmapRefData::Free()
 }
 
 void wxBitmapRefData::Free()

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 90714d1e5ad0a88d8dc52708e1aa06e5276b6cd8..56f2be52f1d60899cfeccb3e236a393de12c134a 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -60,6 +60,10 @@ bool wxChoice::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return FALSE;
 

+    // A choice/combobox normally has a white background (or other, depending
+    // on global settings) rather than inheriting the parent's background colour.
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+

     long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
     if ( style & wxCB_SORT )
         msStyle |= CBS_SORT;
     long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
     if ( style & wxCB_SORT )
         msStyle |= CBS_SORT;

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 0593b9342e9d804ce2ce2af40e1f41fc0b5a533d..93e9b8a731e61f2d46ee87a7d4d4dcb1ddccb23a 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -74,7 +74,12 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
   SetName(name);
   SetValidator(validator);
   if (parent) parent->AddChild(this);
   SetName(name);
   SetValidator(validator);
   if (parent) parent->AddChild(this);

-  SetBackgroundColour(parent->GetBackgroundColour()) ;
+//  SetBackgroundColour(parent->GetBackgroundColour()) ;
+
+  // A choice/combobox normally has a white background (or other, depending
+  // on global settings) rather than inheriting the parent's background colour.
+  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+

   SetForegroundColour(parent->GetForegroundColour()) ;
 
   m_windowStyle = style;
   SetForegroundColour(parent->GetForegroundColour()) ;
 
   m_windowStyle = style;

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index 65c35a32004e96fb863de7eb7fedee1f9e328324..6118357c8f6e029f1de358829c083a9d08aa0765 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -808,6 +808,10 @@ SOURCE=.\msw\gaugemsw.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\gdiimage.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index cc4edd04045c4e1cd68dd3b0936ccdb19a7e91f3..fb824f58fa7a00737406e8f5da7cf0096a96d5cb 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -806,6 +806,10 @@ SOURCE=.\msw\gaugemsw.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\gdiimage.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File