// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "panelg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/colour.h"
#include "wx/settings.h"
#include "wx/log.h"
+ #include "wx/panel.h"
+ #include "wx/containr.h"
#endif
-#include "wx/containr.h"
-#include "wx/panel.h"
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
#if wxUSE_EXTENDED_RTTI
WX_DEFINE_FLAGS( wxPanelStyle )
-WX_BEGIN_FLAGS( wxPanelStyle )
+wxBEGIN_FLAGS( wxPanelStyle )
// new style border flags, we put them first to
// use them for streaming out
- WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
- WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
- WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
- WX_FLAGS_MEMBER(wxBORDER_RAISED)
- WX_FLAGS_MEMBER(wxBORDER_STATIC)
- WX_FLAGS_MEMBER(wxBORDER_NONE)
-
+ wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+ wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+ wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+ wxFLAGS_MEMBER(wxBORDER_RAISED)
+ wxFLAGS_MEMBER(wxBORDER_STATIC)
+ wxFLAGS_MEMBER(wxBORDER_NONE)
+
// old style border flags
- WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
- WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
- WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
- WX_FLAGS_MEMBER(wxRAISED_BORDER)
- WX_FLAGS_MEMBER(wxSTATIC_BORDER)
- WX_FLAGS_MEMBER(wxNO_BORDER)
+ wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+ wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+ wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+ wxFLAGS_MEMBER(wxRAISED_BORDER)
+ wxFLAGS_MEMBER(wxSTATIC_BORDER)
+ wxFLAGS_MEMBER(wxBORDER)
// standard window styles
- WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
- WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
- WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- WX_FLAGS_MEMBER(wxWANTS_CHARS)
- WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
- WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
- WX_FLAGS_MEMBER(wxVSCROLL)
- WX_FLAGS_MEMBER(wxHSCROLL)
+ wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+ wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+ wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+ wxFLAGS_MEMBER(wxWANTS_CHARS)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+ wxFLAGS_MEMBER(wxVSCROLL)
+ wxFLAGS_MEMBER(wxHSCROLL)
-WX_END_FLAGS( wxPanelStyle )
+wxEND_FLAGS( wxPanelStyle )
IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h")
-WX_BEGIN_PROPERTIES_TABLE(wxPanel)
- WX_PROPERTY_FLAGS( WindowStyle , wxPanelStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxBEGIN_PROPERTIES_TABLE(wxPanel)
+ wxPROPERTY_FLAGS( WindowStyle , wxPanelStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
// style wxTAB_TRAVERSAL
-WX_END_PROPERTIES_TABLE()
+wxEND_PROPERTIES_TABLE()
-WX_BEGIN_HANDLERS_TABLE(wxPanel)
-WX_END_HANDLERS_TABLE()
+wxBEGIN_HANDLERS_TABLE(wxPanel)
+wxEND_HANDLERS_TABLE()
-WX_CONSTRUCTOR_5( wxPanel , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+wxCONSTRUCTOR_5( wxPanel , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
#else
IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
#endif
BEGIN_EVENT_TABLE(wxPanel, wxWindow)
- EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-
EVT_SIZE(wxPanel::OnSize)
WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
long style,
const wxString& name)
{
- return wxWindow::Create(parent, id, pos, size, style, name);
+ if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+ return false;
+
+ // so that non-solid background renders correctly under GTK+:
+ SetThemeEnabled(true);
+
+#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__))
+ // Required to get solid control backgrounds under WinCE
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif
+
+ return true;
}
wxPanel::~wxPanel()
// event handlers
// ----------------------------------------------------------------------------
-// Responds to colour changes, and passes event on to children.
-void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- Refresh();
-
- // Propagate the event to the non-top-level children
- wxWindow::OnSysColourChanged(event);
-}
-
void wxPanel::OnSize(wxSizeEvent& event)
{
-#if wxUSE_CONSTRAINTS
if (GetAutoLayout())
Layout();
-#if defined(__WXPM__)
+#if wxUSE_CONSTRAINTS
+#if defined(__WXPM__) && 0
else
{
// Need to properly move child windows under OS/2
// Uninitialized
::WinQueryWindowPos(GetHWND(), pWinSwp);
- }
- else
+ }
+ else
{
SWP vSwp;
int nYDiff;
event.Skip();
}
-