projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added test for no-change in crollwin.
[wxWidgets.git]
/
src
/
stubs
/
frame.cpp
diff --git
a/src/stubs/frame.cpp
b/src/stubs/frame.cpp
index b12097f5c45e9ebffe08245c3ad6ee4dd9136221..aeb2a7800755437db1b5c4d485fd02a96f9c0342 100644
(file)
--- a/
src/stubs/frame.cpp
+++ b/
src/stubs/frame.cpp
@@
-26,7
+26,6
@@
extern wxList wxModelessWindows;
extern wxList wxPendingDelete;
extern wxList wxModelessWindows;
extern wxList wxPendingDelete;
-#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxFrame, wxWindow)
EVT_SIZE(wxFrame::OnSize)
EVT_ACTIVATE(wxFrame::OnActivate)
BEGIN_EVENT_TABLE(wxFrame, wxWindow)
EVT_SIZE(wxFrame::OnSize)
EVT_ACTIVATE(wxFrame::OnActivate)
@@
-37,7
+36,6
@@
BEGIN_EVENT_TABLE(wxFrame, wxWindow)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-#endif
#if wxUSE_NATIVE_STATUSBAR
bool wxFrame::m_useNativeStatusBar = TRUE;
#if wxUSE_NATIVE_STATUSBAR
bool wxFrame::m_useNativeStatusBar = TRUE;
@@
-163,6
+161,13
@@
bool wxFrame::IsIconized() const
return FALSE;
}
return FALSE;
}
+// Is the frame maximized?
+bool wxFrame::IsMaximized(void) const
+{
+ // TODO
+ return FALSE;
+}
+
void wxFrame::SetTitle(const wxString& title)
{
// TODO
void wxFrame::SetTitle(const wxString& title)
{
// TODO
@@
-190,7
+195,7
@@
wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
// Set the height according to the font and the border size
wxClientDC dc(statusBar);
// Set the height according to the font and the border size
wxClientDC dc(statusBar);
- dc.SetFont(
*
statusBar->GetFont());
+ dc.SetFont(statusBar->GetFont());
long x, y;
dc.GetTextExtent("X", &x, &y);
long x, y;
dc.GetTextExtent("X", &x, &y);
@@
-264,7
+269,7
@@
void wxFrame::SetMenuBar(wxMenuBar *menuBar)
void wxFrame::Fit()
{
// Work out max. size
void wxFrame::Fit()
{
// Work out max. size
- wxNode *node = GetChildren()
->
First();
+ wxNode *node = GetChildren()
.
First();
int max_width = 0;
int max_height = 0;
while (node)
int max_width = 0;
int max_height = 0;
while (node)
@@
-321,7
+326,7
@@
void wxFrame::OnSize(wxSizeEvent& event)
// do we have _exactly_ one child?
wxWindow *child = NULL;
// do we have _exactly_ one child?
wxWindow *child = NULL;
- for ( wxNode *node = GetChildren()
->
First(); node; node = node->Next() )
+ for ( wxNode *node = GetChildren()
.
First(); node; node = node->Next() )
{
wxWindow *win = (wxWindow *)node->Data();
if ( !win->IsKindOf(CLASSINFO(wxFrame)) &&
{
wxWindow *win = (wxWindow *)node->Data();
if ( !win->IsKindOf(CLASSINFO(wxFrame)) &&
@@
-351,7
+356,7
@@
void wxFrame::OnSize(wxSizeEvent& event)
// subwindow found.
void wxFrame::OnActivate(wxActivateEvent& event)
{
// subwindow found.
void wxFrame::OnActivate(wxActivateEvent& event)
{
- for(wxNode *node = GetChildren()
->
First(); node; node = node->Next())
+ for(wxNode *node = GetChildren()
.
First(); node; node = node->Next())
{
// Find a child that's a subwindow, but not a dialog box.
wxWindow *child = (wxWindow *)node->Data();
{
// Find a child that's a subwindow, but not a dialog box.
wxWindow *child = (wxWindow *)node->Data();
@@
-364,21
+369,11
@@
void wxFrame::OnActivate(wxActivateEvent& event)
}
}
}
}
-// The default implementation for the close window event - calls
-// OnClose for backward compatibility.
+// The default implementation for the close window event.
void wxFrame::OnCloseWindow(wxCloseEvent& event)
{
void wxFrame::OnCloseWindow(wxCloseEvent& event)
{
- // Compatibility
- if ( GetEventHandler()->OnClose() || event.GetForce())
- {
- this->Destroy();
- }
-}
-
-bool wxFrame::OnClose()
-{
- return TRUE;
+ this->Destroy();
}
// Destroy the window (delayed, if a managed window)
}
// Destroy the window (delayed, if a managed window)
@@
-454,7
+449,8
@@
void wxFrame::ProcessCommand(int id)
}
*/
}
*/
- GetEventHandler()->ProcessEvent(commandEvent);
+ wxEvtHandler* evtHandler = GetEventHandler();
+ evtHandler->ProcessEvent(commandEvent);
}
// Checks if there is a toolbar, and returns the first free client position
}
// Checks if there is a toolbar, and returns the first free client position