ommission

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

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index ce8fb71cf1646551fc0c9b05b719fce9582f6579..35469e70eb79b94aeba468b63d8e3e171e892a2c 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -44,12 +44,10 @@
     // this header is not included from wx/datectrl.h if we have a native
     // version, but we do need it here
     #include "wx/generic/datectrl.h"
     // this header is not included from wx/datectrl.h if we have a native
     // version, but we do need it here
     #include "wx/generic/datectrl.h"

-#endif
-
-// we need to define _WX_DEFINE_DATE_EVENTS_ before including wx/dateevt.h to
-// define the event types we use if we're the only date picker control version
-// being compiled -- otherwise it's defined in the native version implementation
-#ifndef wxHAS_NATIVE_DATEPICKCTRL
+#else
+    // we need to define _WX_DEFINE_DATE_EVENTS_ before including wx/dateevt.h to
+    // define the event types we use if we're the only date picker control version
+    // being compiled -- otherwise it's defined in the native version implementation

     #define _WX_DEFINE_DATE_EVENTS_
 #endif
 
     #define _WX_DEFINE_DATE_EVENTS_
 #endif
 


@@ -74,6 +72,27 @@ enum
     #define DEFAULT_ITEM_WIDTH 100
 #endif
 
     #define DEFAULT_ITEM_WIDTH 100
 #endif
 

+#ifdef __WXMSW__
+    #undef wxUSE_POPUPWIN
+    #define wxUSE_POPUPWIN    0  // Popup not working
+    #define TXTCTRL_FLAGS     wxNO_BORDER
+    #define BTN_FLAGS         wxNO_BORDER
+    #define CALBORDER         0
+    #define RIGHTBUTTONBORDER 3
+    #define TOPBUTTONBORDER   0
+    #define BUTTONBORDER      3
+    #define TXTPOSY           1
+#else
+    #define TXTCTRL_FLAGS     0
+    #define BTN_FLAGS         wxBU_AUTODRAW
+    #define CALBORDER         4
+    #define RIGHTBUTTONBORDER 0
+    #define TOPBUTTONBORDER   0
+    #define BUTTONBORDER      0
+    #define TXTPOSY           0
+#endif
+
+

 // ----------------------------------------------------------------------------
 // local classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // local classes
 // ----------------------------------------------------------------------------


@@ -95,11 +114,11 @@ public:
         m_borderX = -1;
         m_borderY = -1;
     }
         m_borderX = -1;
         m_borderY = -1;
     }

-    void Create(wxWindow *parent,
+    bool Create(wxWindow *parent,

                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = 0, 
+                long style = 0,

                 const wxValidator& validator = wxDefaultValidator);
 
     void DoMoveWindow(int x, int y, int w, int h);
                 const wxValidator& validator = wxDefaultValidator);
 
     void DoMoveWindow(int x, int y, int w, int h);


@@ -121,27 +140,33 @@ wxDropdownButton::wxDropdownButton(wxWindow *parent,
 }
 
 
 }
 
 

-void wxDropdownButton::Create(wxWindow *parent,
+bool wxDropdownButton::Create(wxWindow *parent,

                               wxWindowID id,
                               const wxPoint& pos,
                               const wxSize& size,
                               wxWindowID id,
                               const wxPoint& pos,
                               const wxSize& size,

-                              long style,
+                              long WXUNUSED(style),

                               const wxValidator& validator)
 {
                               const wxValidator& validator)
 {

-    wxBitmap chkBmp(15,15);  // arbitrary
-    wxBitmapButton::Create(parent, id, chkBmp, pos, wxDefaultSize, wxBU_AUTODRAW, validator);
+    m_marginX = 0;
+    m_marginY = 0;

 
 

-    int w, h;
+    wxBitmap chkBmp(15,15);  // arbitrary
+    if ( !wxBitmapButton::Create(parent, id, chkBmp,
+                                 pos, wxDefaultSize, BTN_FLAGS, validator) )
+        return false;

 
 

-    w=chkBmp.GetWidth();
-    h=chkBmp.GetHeight();
-    m_borderX = GetSize().x - m_marginX - w;
-    m_borderY = GetSize().y - m_marginY - h;
+    const wxSize sz = GetSize();
+    int w = chkBmp.GetWidth(),
+        h = chkBmp.GetHeight();
+    m_borderX = sz.x - m_marginX - w;
+    m_borderY = sz.y - m_marginY - h;

 
 

-    w = (size.x > 0 ? size.x : GetSize().x);
-    h = (size.y > 0 ? size.y : GetSize().y);
+    w = size.x > 0 ? size.x : sz.x;
+    h = size.y > 0 ? size.y : sz.y;

 
     DoMoveWindow(pos.x, pos.y, w, h);
 
     DoMoveWindow(pos.x, pos.y, w, h);

+
+    return true;

 }
 
 
 }
 
 


@@ -167,9 +192,15 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
         wxBitmap bmp(bw, bh);
         dc.SelectObject(bmp);
 
         wxBitmap bmp(bw, bh);
         dc.SelectObject(bmp);
 

-        wxRendererNative::Get().DrawComboBoxDropButton(this, dc, wxRect(0,0,bw, bh));
-
+        wxRect r(0,0,bw, bh);
+        wxRendererNative& renderer = wxRendererNative::Get();
+        renderer.DrawComboBoxDropButton(this, dc, r);

         SetBitmapLabel(bmp);
         SetBitmapLabel(bmp);

+
+        wxBitmap bmpSel(bw, bh);
+        dc.SelectObject(bmpSel);
+        renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
+        SetBitmapSelected(bmpSel);

     }
 
     wxBitmapButton::DoMoveWindow(x, y, w, h);
     }
 
     wxBitmapButton::DoMoveWindow(x, y, w, h);


@@ -237,7 +268,7 @@ BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
 END_EVENT_TABLE()
 
 #ifndef wxHAS_NATIVE_DATEPICKCTRL
 END_EVENT_TABLE()
 
 #ifndef wxHAS_NATIVE_DATEPICKCTRL

-    IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxDatePickerCtrlBase)
+    IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -266,7 +297,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 
     InheritAttributes();
 
 
     InheritAttributes();
 

-    m_txt = new wxTextCtrl(this, CTRLID_TXT);
+    m_txt = new wxTextCtrl(this, CTRLID_TXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, TXTCTRL_FLAGS);

 
     m_txt->Connect(wxEVT_KEY_DOWN,
                    wxKeyEventHandler(wxDatePickerCtrlGeneric::OnEditKey),
 
     m_txt->Connect(wxEVT_KEY_DOWN,
                    wxKeyEventHandler(wxDatePickerCtrlGeneric::OnEditKey),


@@ -275,10 +306,10 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
                    wxFocusEventHandler(wxDatePickerCtrlGeneric::OnKillFocus),
                    NULL, this);
 
                    wxFocusEventHandler(wxDatePickerCtrlGeneric::OnKillFocus),
                    NULL, this);
 

-    const int height = m_txt->GetBestSize().y;
+    const int height = m_txt->GetBestSize().y - BUTTONBORDER;

 
     m_btn = new wxDropdownButton(this, CTRLID_BTN, wxDefaultPosition, wxSize(height, height));
 
     m_btn = new wxDropdownButton(this, CTRLID_BTN, wxDefaultPosition, wxSize(height, height));

- 
+

     m_popup = new wxDatePopupInternal(this);
     m_popup->SetFont(GetFont());
 
     m_popup = new wxDatePopupInternal(this);
     m_popup->SetFont(GetFont());
 


@@ -313,7 +344,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
             wxFocusEventHandler(wxDatePickerCtrlGeneric::OnSetFocus));
 
     wxClientDC dc(yearControl);
             wxFocusEventHandler(wxDatePickerCtrlGeneric::OnSetFocus));
 
     wxClientDC dc(yearControl);

-    dc.SetFont(m_font);
+    dc.SetFont(yearControl->GetFont());

     wxCoord width, dummy;
     dc.GetTextExtent(wxT("2000"), &width, &dummy);
     width += ConvertDialogToPixels(wxSize(20, 0)).x;
     wxCoord width, dummy;
     dc.GetTextExtent(wxT("2000"), &width, &dummy);
     width += ConvertDialogToPixels(wxSize(20, 0)).x;


@@ -326,17 +357,6 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 
     SetFormat(wxT("%x"));
 
 
     SetFormat(wxT("%x"));
 

-
-#ifdef __WXMSW__
-    #define CALBORDER         0
-    #define RIGHTBUTTONBORDER 2
-    #define TOPBUTTONBORDER   1
-#else
-    #define CALBORDER         4
-    #define RIGHTBUTTONBORDER 0
-    #define TOPBUTTONBORDER   0
-#endif
-

     width = yearPosition.x + yearSize.x+2+CALBORDER/2;
     if (width < calSize.x-4)
         width = calSize.x-4;
     width = yearPosition.x + yearSize.x+2+CALBORDER/2;
     if (width < calSize.x-4)
         width = calSize.x-4;


@@ -358,10 +378,9 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
     m_popup->SetClientSize(panel->GetSize());
     m_popup->Hide();
 
     m_popup->SetClientSize(panel->GetSize());
     m_popup->Hide();
 

-    if (!date.IsValid())
-        date.Today();
+    SetValue(date.IsValid() ? date : wxDateTime::Today());

 
 

-    SetValue(date);
+    SetBestFittingSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -408,7 +427,7 @@ void wxDatePickerCtrlGeneric::DoMoveWindow(int x, int y, int w, int h)
     wxSize bs=m_btn->GetBestSize();
     int eh=m_txt->GetBestSize().y;
 
     wxSize bs=m_btn->GetBestSize();
     int eh=m_txt->GetBestSize().y;
 

-    m_txt->SetSize(0, 0, w-bs.x-1, h > eh ? eh : h);
+    m_txt->SetSize(0, TXTPOSY, w-bs.x-RIGHTBUTTONBORDER, h > eh ? eh-TXTPOSY : h-TXTPOSY);

     m_btn->SetSize(w - bs.x-RIGHTBUTTONBORDER, TOPBUTTONBORDER, bs.x, h > bs.y ? bs.y : h);
 
     if (m_dropped)
     m_btn->SetSize(w - bs.x-RIGHTBUTTONBORDER, TOPBUTTONBORDER, bs.x, h > bs.y ? bs.y : h);
 
     if (m_dropped)


@@ -454,6 +473,8 @@ bool wxDatePickerCtrlGeneric::Enable(bool enable)
     {
         if ( m_cal )
             m_cal->Hide();
     {
         if ( m_cal )
             m_cal->Hide();

+        if ( m_popup )
+            m_popup->Hide();

     }
 
     if ( m_btn )
     }
 
     if ( m_btn )