#include "wx/log.h"
#include "wx/dcclient.h"
#include "wx/settings.h"
- #include "wx/dialog.h"
#include "wx/timer.h"
#include "wx/textctrl.h"
#endif
#if defined(__WXMSW__)
+// Let's use wxFrame as a fall-back solution until wxMSW gets wxNonOwnedWindow
+#include "wx/frame.h"
+#define wxCC_GENERIC_TLW_IS_FRAME
+#define wxComboCtrlGenericTLW wxFrame
+
#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
// native controls work on it like normal.
#elif defined(__WXGTK__)
-#include "wx/gtk/private.h"
-
// NB: It is not recommended to use wxDialog as popup on wxGTK, because of
// this bug: If wxDialog is hidden, its position becomes corrupt
// between hide and next show, but without internal coordinates being
// reflected (or something like that - atleast commenting out ->Hide()
// seemed to eliminate the position change).
+#include "wx/dialog.h"
+#define wxCC_GENERIC_TLW_IS_DIALOG
+#define wxComboCtrlGenericTLW wxDialog
+
+#include "wx/gtk/private.h"
+
// NB: Let's not be afraid to use wxGTK's wxPopupTransientWindow as a
// 'perfect' popup, as it can succesfully host child controls even in
// popups that are shown in modal dialogs.
#elif defined(__WXMAC__)
+#include "wx/nonownedwnd.h"
+#define wxCC_GENERIC_TLW_IS_NONOWNEDWINDOW
+#define wxComboCtrlGenericTLW wxNonOwnedWindow
+
#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.
#else
+#include "wx/dialog.h"
+#define wxCC_GENERIC_TLW_IS_DIALOG
+#define wxComboCtrlGenericTLW wxDialog
+
#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
// native controls work on it like normal.
POPUPWIN_NONE = 0,
POPUPWIN_WXPOPUPTRANSIENTWINDOW = 1,
POPUPWIN_WXPOPUPWINDOW = 2,
- POPUPWIN_WXDIALOG = 3
+ POPUPWIN_GENERICTLW = 3
};
#define SECONDARY_POPUP_TYPE POPUPWIN_WXPOPUPWINDOW
#define USES_WXPOPUPWINDOW 1
#else
- #define wxComboPopupWindowBase2 wxDialog
- #define SECONDARY_POPUP_TYPE POPUPWIN_WXDIALOG
- #define USES_WXDIALOG 1
+ #define wxComboPopupWindowBase2 wxComboCtrlGenericTLW
+ #define SECONDARY_POPUP_TYPE POPUPWIN_GENERICTLW
+ #define USES_GENERICTLW 1
#endif
#elif wxUSE_POPUPWIN
#define USES_WXPOPUPWINDOW 1
#if !POPUPWIN_IS_PERFECT
- #define wxComboPopupWindowBase2 wxDialog
- #define SECONDARY_POPUP_TYPE POPUPWIN_WXDIALOG
- #define USES_WXDIALOG 1
+ #define wxComboPopupWindowBase2 wxComboCtrlGenericTLW
+ #define SECONDARY_POPUP_TYPE POPUPWIN_GENERICTLW
+ #define USES_GENERICTLW 1
#endif
#else
// wxPopupWindow is not implemented
- #define wxComboPopupWindowBase wxDialog
- #define PRIMARY_POPUP_TYPE POPUPWIN_WXDIALOG
- #define USES_WXDIALOG 1
+ #define wxComboPopupWindowBase wxComboCtrlGenericTLW
+ #define PRIMARY_POPUP_TYPE POPUPWIN_GENERICTLW
+ #define USES_GENERICTLW 1
#endif
#define USES_WXPOPUPWINDOW 0
#endif
-#ifndef USES_WXDIALOG
- #define USES_WXDIALOG 0
+#ifndef USES_GENERICTLW
+ #define USES_GENERICTLW 0
#endif
void OnSizeEvent( wxSizeEvent& event );
void OnKeyEvent(wxKeyEvent& event);
-#if USES_WXDIALOG
+#if USES_GENERICTLW
void OnActivate( wxActivateEvent& event );
#endif
BEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
EVT_KEY_DOWN(wxComboPopupWindowEvtHandler::OnKeyEvent)
EVT_KEY_UP(wxComboPopupWindowEvtHandler::OnKeyEvent)
-#if USES_WXDIALOG
+#if USES_GENERICTLW
EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate)
#endif
EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent)
child->GetEventHandler()->AddPendingEvent(event);
}
-#if USES_WXDIALOG
+#if USES_GENERICTLW
void wxComboPopupWindowEvtHandler::OnActivate( wxActivateEvent& event )
{
if ( !event.GetActive() )
m_text->Create(this, wxID_ANY, m_valueString,
wxDefaultPosition, wxSize(10,-1),
style, validator);
+ m_text->SetHint(m_hintText);
}
}
// be the correct colour and themed brush. Instead we'll use
// wxSYS_COLOUR_WINDOW in the EVT_PAINT handler as needed.
#ifndef __WXMAC__
- SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-#endif
+ #if defined(__WXMSW__) || defined(__WXGTK__)
+ wxVisualAttributes vattrs = wxComboBox::GetClassDefaultAttributes();
+ #else
+ wxVisualAttributes vattrs;
+ vattrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+ vattrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+ #endif
+
+ // Only change the colours if application has not specified
+ // custom ones.
+ if ( !m_hasFgCol )
+ {
+ SetOwnForegroundColour(vattrs.colFg);
+ m_hasFgCol = false;
+ }
+ if ( !m_hasBgCol )
+ {
+ SetOwnBackgroundColour(vattrs.colBg);
+ m_hasBgCol = false;
+ }
+#endif // !__WXMAC__
}
wxComboCtrlBase::~wxComboCtrlBase()
}
#endif // wxUSE_VALIDATORS
+bool wxComboCtrlBase::SetForegroundColour(const wxColour& colour)
+{
+ if ( wxControl::SetForegroundColour(colour) )
+ {
+ if ( m_text )
+ m_text->SetForegroundColour(colour);
+ return true;
+ }
+ return false;
+}
+
+bool wxComboCtrlBase::SetBackgroundColour(const wxColour& colour)
+{
+ if ( wxControl::SetBackgroundColour(colour) )
+ {
+ if ( m_text )
+ m_text->SetBackgroundColour(colour);
+ return true;
+ }
+ return false;
+}
// ----------------------------------------------------------------------------
// painting
// ----------------------------------------------------------------------------
selRect.width -= wcp + (focusSpacingX*2);
wxColour bgCol;
+ wxColour fgCol;
+
bool doDrawSelRect = true;
+ // Determine foreground colour
+ if ( isEnabled )
+ {
+ if ( doDrawFocusRect )
+ {
+ fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ }
+ else if ( m_hasFgCol )
+ {
+ // Honour the custom foreground colour
+ fgCol = GetForegroundColour();
+ }
+ else
+ {
+ fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+ }
+ }
+ else
+ {
+ fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
+ }
+
+ // Determine background colour
if ( isEnabled )
{
- // If popup is hidden and this control is focused,
- // then draw the focus-indicator (selbgcolor background etc.).
if ( doDrawFocusRect )
{
- dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
}
+ else if ( m_hasBgCol )
+ {
+ // Honour the custom background colour
+ bgCol = GetBackgroundColour();
+ }
else
{
- dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
#ifndef __WXMAC__ // see note in OnThemeChange
doDrawSelRect = false;
bgCol = GetBackgroundColour();
}
else
{
- dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT) );
#ifndef __WXMAC__ // see note in OnThemeChange
bgCol = GetBackgroundColour();
#else
#endif
}
+ dc.SetTextForeground( fgCol );
dc.SetBrush( bgCol );
if ( doDrawSelRect )
{
wxLongLong t = ::wxGetLocalTimeMillis();
int evtType = event.GetEventType();
-#if USES_WXPOPUPWINDOW || USES_WXDIALOG
+#if USES_WXPOPUPWINDOW || USES_GENERICTLW
if ( m_popupWinType != POPUPWIN_WXPOPUPTRANSIENTWINDOW )
{
if ( IsPopupWindowState(Visible) &&
}
else // no popup
{
- if ( GetParent()->HasFlag(wxTAB_TRAVERSAL) &&
- HandleAsNavigationKey(event) )
- return;
+ wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
+
+ if ( mainCtrl->GetParent()->HasFlag(wxTAB_TRAVERSAL) )
+ {
+ if ( mainCtrl->HandleAsNavigationKey(event) )
+ return;
+ }
if ( IsKeyPopupToggle(event) )
{
#ifdef wxComboPopupWindowBase2
if ( m_iFlags & wxCC_IFLAG_USE_ALT_POPUP )
{
- #if !USES_WXDIALOG
+ #if !USES_GENERICTLW
m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER );
#else
+ int tlwFlags = wxNO_BORDER;
+ #ifdef wxCC_GENERIC_TLW_IS_FRAME
+ tlwFlags |= wxFRAME_NO_TASKBAR;
+ #endif
+
+ #ifdef wxCC_GENERIC_TLW_IS_NONOWNEDWINDOW
+ m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY,
+ wxPoint(-21,-21), wxSize(20, 20),
+ tlwFlags );
+ #else
m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY, wxEmptyString,
wxPoint(-21,-21), wxSize(20, 20),
- wxNO_BORDER );
+ tlwFlags );
+ #endif
#endif
m_popupWinType = SECONDARY_POPUP_TYPE;
}
{
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
event.SetEventObject(this);
- ProcessCommand(event);
+ HandleWindowEvent(event);
ShowPopup();
}
// that if transient popup is open, then tab traversal is to be ignored.
// However, I think this code would still be needed for cases where
// transient popup doesn't work yet (wxWinCE?).
- wxWindow* parent = GetParent();
+ wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
+ wxWindow* parent = mainCtrl->GetParent();
int parentFlags = parent->GetWindowStyle();
if ( parentFlags & wxTAB_TRAVERSAL )
{
{
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
event.SetEventObject(this);
- ProcessCommand(event);
+ HandleWindowEvent(event);
}
}
return wxPoint(m_marginLeft, -1);
}
-#if WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_8
void wxComboCtrlBase::SetTextIndent( int indent )
{
if ( indent < 0 )
m_text->Undo();
}
+bool wxComboCtrlBase::SetHint(const wxString& hint)
+{
+ m_hintText = hint;
+ bool res = true;
+ if ( m_text )
+ res = m_text->SetHint(hint);
+ Refresh();
+ return res;
+}
+
+wxString wxComboCtrlBase::GetHint() const
+{
+ return m_hintText;
+}
+
#endif // wxUSE_COMBOCTRL
projects / wxWidgets.git / blobdiff