projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
addind nonowned window implementation
[wxWidgets.git]
/
src
/
generic
/
panelg.cpp
diff --git
a/src/generic/panelg.cpp
b/src/generic/panelg.cpp
index ff850d052b99abae00bafb6f3018cbd26bb1a1c0..d714bce3c08935bc3602c6f9453b590ea8e3adb7 100644
(file)
--- a/
src/generic/panelg.cpp
+++ b/
src/generic/panelg.cpp
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// 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"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-34,11
+30,10
@@
#include "wx/colour.h"
#include "wx/settings.h"
#include "wx/log.h"
#include "wx/colour.h"
#include "wx/settings.h"
#include "wx/log.h"
+ #include "wx/panel.h"
+ #include "wx/containr.h"
#endif
#endif
-#include "wx/containr.h"
-#include "wx/panel.h"
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
@@
-102,7
+97,7
@@
END_EVENT_TABLE()
// implementation
// ============================================================================
// implementation
// ============================================================================
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel
, wxWindow
)
// ----------------------------------------------------------------------------
// wxPanel creation
// ----------------------------------------------------------------------------
// wxPanel creation
@@
-110,7
+105,7
@@
WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
void wxPanel::Init()
{
void wxPanel::Init()
{
-
m_container.SetContainerWindow(this
);
+
WX_INIT_CONTROL_CONTAINER(
);
}
bool wxPanel::Create(wxWindow *parent, wxWindowID id,
}
bool wxPanel::Create(wxWindow *parent, wxWindowID id,
@@
-125,6
+120,11
@@
bool wxPanel::Create(wxWindow *parent, wxWindowID id,
// so that non-solid background renders correctly under GTK+:
SetThemeEnabled(true);
// 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;
}
return true;
}
@@
-148,7
+148,7
@@
void wxPanel::OnSize(wxSizeEvent& event)
if (GetAutoLayout())
Layout();
#if wxUSE_CONSTRAINTS
if (GetAutoLayout())
Layout();
#if wxUSE_CONSTRAINTS
-#if defined(__WXPM__)
+#if defined(__WXPM__)
&& 0
else
{
// Need to properly move child windows under OS/2
else
{
// Need to properly move child windows under OS/2
@@
-178,4
+178,3
@@
void wxPanel::OnSize(wxSizeEvent& event)
event.Skip();
}
event.Skip();
}
-