configure fix for OS/2 from Dave Parsons and David Webster

[wxWidgets.git] / src / generic / datectlg.cpp

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index c035731aab81f388ebf889c45876e153bfb6e7ab..90258753aef87de659aa3ddb21e97a0989406a69 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -78,9 +78,9 @@ enum
     #define TXTCTRL_FLAGS     wxNO_BORDER
     #define BTN_FLAGS         wxNO_BORDER
     #define CALBORDER         0
     #define TXTCTRL_FLAGS     wxNO_BORDER
     #define BTN_FLAGS         wxNO_BORDER
     #define CALBORDER         0

-    #define RIGHTBUTTONBORDER 3
+    #define RIGHTBUTTONBORDER 4

     #define TOPBUTTONBORDER   0
     #define TOPBUTTONBORDER   0

-    #define BUTTONBORDER      3
+    #define BUTTONBORDER      4

     #define TXTPOSY           1
 #else
     #define TXTCTRL_FLAGS     0
     #define TXTPOSY           1
 #else
     #define TXTCTRL_FLAGS     0


@@ -184,22 +184,46 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
         if (h < 0)
             h = GetSize().y;
 
         if (h < 0)
             h = GetSize().y;
 

-        int bw = w - m_marginX - m_borderX;
-        int bh = h - m_marginY - m_borderY;
+        int borderX = m_marginX + m_borderX; 
+        int borderY = m_marginY + m_borderY;
+        int bw = w - borderX;
+        int bh = h - borderY;

         if (bh < 11) bh=11;
         if (bw < 9)  bw=9;
 
         wxBitmap bmp(bw, bh);
         dc.SelectObject(bmp);
 
         if (bh < 11) bh=11;
         if (bw < 9)  bw=9;
 
         wxBitmap bmp(bw, bh);
         dc.SelectObject(bmp);
 

-        wxRect r(0,0,bw, bh);

         wxRendererNative& renderer = wxRendererNative::Get();
         wxRendererNative& renderer = wxRendererNative::Get();

+
+#ifdef __WXGTK__
+        wxRect r(-(borderX/2),-(borderY/2),w,h);
+        wxColour magic(255,0,255);
+        dc.SetBrush( wxBrush( magic ) );
+        dc.SetPen( *wxTRANSPARENT_PEN );
+        dc.DrawRectangle(0,0,bw,bh);
+        renderer.DrawDropArrow(this, dc, r);
+        wxMask *mask = new wxMask( bmp, magic );
+        bmp.SetMask( mask );
+#else
+        wxRect r(0,0,bw,bh);

         renderer.DrawComboBoxDropButton(this, dc, r);
         renderer.DrawComboBoxDropButton(this, dc, r);

+#endif

         SetBitmapLabel(bmp);
 
         wxBitmap bmpSel(bw, bh);
         dc.SelectObject(bmpSel);
         SetBitmapLabel(bmp);
 
         wxBitmap bmpSel(bw, bh);
         dc.SelectObject(bmpSel);

+
+#ifdef __WXGTK__
+        dc.SetBrush( wxBrush( magic ) );
+        dc.SetPen( *wxTRANSPARENT_PEN );
+        dc.DrawRectangle(0,0,bw,bh);
+        renderer.DrawDropArrow(this, dc, r, wxCONTROL_PRESSED);
+        mask = new wxMask( bmpSel, magic );
+        bmpSel.SetMask( mask );
+#else

         renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
         renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);

+#endif

         SetBitmapSelected(bmpSel);
     }
 
         SetBitmapSelected(bmpSel);
     }
 


@@ -546,10 +570,11 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
                 allowedChars.Add(wxString(*p++, 1));
         }
 
                 allowedChars.Add(wxString(*p++, 1));
         }
 

+#if wxUSE_VALIDATORS

         wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
         tv.SetIncludes(allowedChars);
         wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
         tv.SetIncludes(allowedChars);

-

         m_txt->SetValidator(tv);
         m_txt->SetValidator(tv);

+#endif

 
         if (m_currentDate.IsValid())
             m_txt->SetValue(m_currentDate.Format(m_format));
 
         if (m_currentDate.IsValid())
             m_txt->SetValue(m_currentDate.Format(m_format));