7f603c959f
This MSW-specific hack is actually needed by all windows containing more than one control, even if they don't derive from wxPanel (which is just the most commonly used class for such windows), otherwise the parts of the window not covered by the child controls won't have the correct appearance when the window itself is inside a wxNotebook. So do this for all classes inheriting from wxNavigationEnabled<>, notably this fixes the wrong background for all kinds of picker controls (wxDirPickerCtrl, wxFilePickerCtrl, ...) when they're used inside a wxNotebook. After moving this method out of wxPanel, src/msw/panel.cpp became empty, so also delete it and remove it from {bake,make,project} files.
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/panel.h
|
|
// Purpose: wxMSW-specific wxPanel class.
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2011-03-18
|
|
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_PANEL_H_
|
|
#define _WX_MSW_PANEL_H_
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxBrush;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxPanel
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
|
|
{
|
|
public:
|
|
wxPanel() { }
|
|
|
|
wxPanel(wxWindow *parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTAB_TRAVERSAL | wxNO_BORDER,
|
|
const wxString& name = wxPanelNameStr)
|
|
{
|
|
Create(parent, winid, pos, size, style, name);
|
|
}
|
|
|
|
#if WXWIN_COMPATIBILITY_2_8
|
|
wxDEPRECATED_CONSTRUCTOR(
|
|
wxPanel(wxWindow *parent,
|
|
int x, int y, int width, int height,
|
|
long style = wxTAB_TRAVERSAL | wxNO_BORDER,
|
|
const wxString& name = wxPanelNameStr)
|
|
{
|
|
Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
|
|
}
|
|
)
|
|
#endif // WXWIN_COMPATIBILITY_2_8
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
|
|
};
|
|
|
|
#endif // _WX_MSW_PANEL_H_
|