Take basic style into account when applying style sheet

[wxWidgets.git] / src / common / combocmn.cpp

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 588772db18f6f42b712d9569ea5d3d967ba195d8..8fb796c2ccaa3761846f249699c53cc5215bad84 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -34,6 +34,7 @@
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/timer.h"

+    #include "wx/textctrl.h"

 #endif
 
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"


@@ -85,10 +86,10 @@
 
 #elif defined(__WXMAC__)
 
 
 #elif defined(__WXMAC__)
 

-#define USE_TRANSIENT_POPUP           0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
-#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+#define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common

                                         // native controls work on it like normal.
                                         // native controls work on it like normal.

-#define POPUPWIN_IS_PERFECT           0 // Same, but for non-transient popup window.
+#define POPUPWIN_IS_PERFECT           1 // Same, but for non-transient popup window.

 #define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
 #define FOCUS_RING                    3 // Reserve room for the textctrl's focus ring to display
 
 #define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
 #define FOCUS_RING                    3 // Reserve room for the textctrl's focus ring to display
 


@@ -112,7 +113,7 @@
 // Popupwin is really only supported on wxMSW (not WINCE) and wxGTK, regardless
 // what the wxUSE_POPUPWIN says.
 // FIXME: Why isn't wxUSE_POPUPWIN reliable any longer? (it was in wxW2.6.2)
 // Popupwin is really only supported on wxMSW (not WINCE) and wxGTK, regardless
 // what the wxUSE_POPUPWIN says.
 // FIXME: Why isn't wxUSE_POPUPWIN reliable any longer? (it was in wxW2.6.2)

-#if (!defined(__WXMSW__) && !defined(__WXGTK__)) || defined(__WXWINCE__)
+#if (!defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMAC__)) || defined(__WXWINCE__)

 #undef wxUSE_POPUPWIN
 #define wxUSE_POPUPWIN 0
 #endif
 #undef wxUSE_POPUPWIN
 #define wxUSE_POPUPWIN 0
 #endif


@@ -1005,10 +1006,10 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
         {
             int newY = butHeight+(customBorder*2);
             SetClientSize(wxDefaultCoord,newY);
         {
             int newY = butHeight+(customBorder*2);
             SetClientSize(wxDefaultCoord,newY);

-    if ( m_bmpNormal.Ok() || m_btnArea.width != butWidth || m_btnArea.height != butHeight )
-        m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
-    else
-        m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+            if ( m_bmpNormal.Ok() || m_btnArea.width != butWidth || m_btnArea.height != butHeight )
+                m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+            else
+                m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;

 
             sz.y = newY;
         }
 
             sz.y = newY;
         }


@@ -1265,7 +1266,7 @@ void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags
     {
         // Drawing control
         isEnabled = IsEnabled();
     {
         // Drawing control
         isEnabled = IsEnabled();

-        doDrawFocusRect = ShouldDrawFocus() & !(m_iFlags & wxCC_FULL_BUTTON);
+        doDrawFocusRect = ShouldDrawFocus() && !(m_iFlags & wxCC_FULL_BUTTON);

 
         // Windows-style: for smaller size control (and for disabled background) use less spacing
         focusSpacingX = isEnabled ? 2 : 1;
 
         // Windows-style: for smaller size control (and for disabled background) use less spacing
         focusSpacingX = isEnabled ? 2 : 1;


@@ -1275,7 +1276,7 @@ void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags
     {
         // Drawing a list item
         isEnabled = true; // they are never disabled
     {
         // Drawing a list item
         isEnabled = true; // they are never disabled

-        doDrawFocusRect = flags & wxCONTROL_SELECTED ? true : false;
+        doDrawFocusRect = (flags & wxCONTROL_SELECTED) != 0;

 
         focusSpacingX = 0;
         focusSpacingY = 0;
 
         focusSpacingX = 0;
         focusSpacingY = 0;


@@ -2249,6 +2250,7 @@ void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
             m_ignoreEvtText++;
 
         m_text->SetValue(value);
             m_ignoreEvtText++;
 
         m_text->SetValue(value);

+

         if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
             m_text->SelectAll();
     }
         if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
             m_text->SelectAll();
     }


@@ -2261,7 +2263,8 @@ void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
 
         EnsurePopupControl();
 
 
         EnsurePopupControl();
 

-        m_popupInterface->SetStringValue(value);
+        if (m_popupInterface)
+            m_popupInterface->SetStringValue(value);

     }
 
     Refresh();
     }
 
     Refresh();