Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / src / msw / choice.cpp

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 90714d1e5ad0a88d8dc52708e1aa06e5276b6cd8..a6144b1da21cfd3df3ea448ef044b117077bdf09 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -32,13 +32,12 @@
     #include "wx/choice.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/choice.h"
     #include "wx/utils.h"
     #include "wx/log.h"

+    #include "wx/settings.h"

 #endif
 
 #include "wx/msw/private.h"
 
 #endif
 
 #include "wx/msw/private.h"
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)

-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -75,6 +74,10 @@ bool wxChoice::Create(wxWindow *parent,
     if ( !MSWCreateControl(wxT("COMBOBOX"), msStyle) )
         return FALSE;
 
     if ( !MSWCreateControl(wxT("COMBOBOX"), msStyle) )
         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));
+

     for ( int i = 0; i < n; i++ )
     {
         Append(choices[i]);
     for ( int i = 0; i < n; i++ )
     {
         Append(choices[i]);


@@ -258,7 +261,7 @@ void wxChoice::DoSetSize(int x, int y,
     wxControl::DoSetSize(x, y, width, -1, sizeFlags);
 }
 
     wxControl::DoSetSize(x, y, width, -1, sizeFlags);
 }
 

-wxSize wxChoice::DoGetBestSize()
+wxSize wxChoice::DoGetBestSize() const

 {
     // find the widest string
     int wLine;
 {
     // find the widest string
     int wLine;