fixed serious bug in wxFont::operator== (ignored weight)

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 87f286d9434c7f0fc5697344fd3b19b81cc055c2..6c9206a7960773f5a61ec7fbdb0955408f6fa968 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_CHOICE
+

 #ifndef WX_PRECOMP
     #include "wx/choice.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/choice.h"
     #include "wx/utils.h"


@@ -38,7 +40,7 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-    IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)

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


@@ -64,6 +66,10 @@ bool wxChoice::Create(wxWindow *parent,
     if ( style & wxCB_SORT )
         msStyle |= CBS_SORT;
 
     if ( style & wxCB_SORT )
         msStyle |= CBS_SORT;
 

+    if ( style & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;
+
+

     // Experience shows that wxChoice vs. wxComboBox distinction confuses
     // quite a few people - try to help them
     wxASSERT_MSG( !(style & wxCB_DROPDOWN) &&
     // Experience shows that wxChoice vs. wxComboBox distinction confuses
     // quite a few people - try to help them
     wxASSERT_MSG( !(style & wxCB_DROPDOWN) &&


@@ -185,7 +191,7 @@ int wxChoice::FindString(const wxString& s) const
 #endif // Watcom/!Watcom
 }
 
 #endif // Watcom/!Watcom
 }
 

-void wxChoice::SetString(int n, const wxString& s)
+void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))

 {
     wxFAIL_MSG(wxT("not implemented"));
 
 {
     wxFAIL_MSG(wxT("not implemented"));
 


@@ -250,8 +256,26 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const
 // wxMSW specific helpers
 // ----------------------------------------------------------------------------
 
 // wxMSW specific helpers
 // ----------------------------------------------------------------------------
 

+void wxChoice::DoMoveWindow(int x, int y, int width, int height)
+{
+    // here is why this is necessary: if the width is negative, the combobox
+    // window proc makes the window of the size width*height instead of
+    // interpreting height in the usual manner (meaning the height of the drop
+    // down list - usually the height specified in the call to MoveWindow()
+    // will not change the height of combo box per se)
+    //
+    // this behaviour is not documented anywhere, but this is just how it is
+    // here (NT 4.4) and, anyhow, the check shouldn't hurt - however without
+    // the check, constraints/sizers using combos may break the height
+    // constraint will have not at all the same value as expected
+    if ( width < 0 )
+        return;
+
+    wxControl::DoMoveWindow(x, y, width, height);
+}
+

 void wxChoice::DoSetSize(int x, int y,
 void wxChoice::DoSetSize(int x, int y,

-                         int width, int height,
+                         int width, int WXUNUSED(height),

                          int sizeFlags)
 {
     // Ignore height parameter because height doesn't mean 'initially
                          int sizeFlags)
 {
     // Ignore height parameter because height doesn't mean 'initially


@@ -338,10 +362,17 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     return TRUE;
 }
 
     return TRUE;
 }
 

-WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
+#if wxUSE_CTL3D

                                WXUINT message,
                                WXWPARAM wParam,
                                WXUINT message,
                                WXWPARAM wParam,

-                               WXLPARAM lParam)
+                               WXLPARAM lParam
+#else
+                               WXUINT WXUNUSED(message),
+                               WXWPARAM WXUNUSED(wParam),
+                               WXLPARAM WXUNUSED(lParam)
+#endif
+     )

 {
 #if wxUSE_CTL3D
     if ( m_useCtl3D )
 {
 #if wxUSE_CTL3D
     if ( m_useCtl3D )


@@ -370,4 +401,4 @@ WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
     return (WXHBRUSH)brush->GetResourceHandle();
 }
 
     return (WXHBRUSH)brush->GetResourceHandle();
 }
 

-
+#endif // wxUSE_CHOICE