Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-02 10:40:34 +00:00
parent 24fd6d87e9
commit 0c39421228
3 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/event.h
View File

@@ -419,7 +419,7 @@ public:
void CopyObject(wxObject& obj) const; void CopyObject(wxObject& obj) const;
#ifdef WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2
bool Checked() const { return IsChecked(); } bool Checked() const { return IsChecked(); }
#endif // WXWIN_COMPATIBILITY_2 #endif // WXWIN_COMPATIBILITY_2

13
src/gtk/frame.cpp
View File

@@ -23,7 +23,8 @@
#define XIconifyWindow XICONIFYWINDOW #define XIconifyWindow XICONIFYWINDOW
#endif #endif
#include "wx/frame.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/control.h" #include "wx/control.h"
#include "wx/app.h" #include "wx/app.h"
@@ -1248,15 +1249,5 @@ void wxFrameGTK::SetIconizeState(bool iconize)
m_isIconized = iconize; m_isIconized = iconize;
(void)SendIconizeEvent(iconize); (void)SendIconizeEvent(iconize);
} }
else
{
// this is not supposed to happen if we're called only from
// gtk_frame_(un)map_callback!
// RR: I don't understand this test. Upon startup, the frame is
// not iconized by default, it has just not been created
// yet.
///wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") );
}
} }

13
src/gtk1/frame.cpp
View File

@@ -23,7 +23,8 @@
#define XIconifyWindow XICONIFYWINDOW #define XIconifyWindow XICONIFYWINDOW
#endif #endif
#include "wx/frame.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/control.h" #include "wx/control.h"
#include "wx/app.h" #include "wx/app.h"
@@ -1248,15 +1249,5 @@ void wxFrameGTK::SetIconizeState(bool iconize)
m_isIconized = iconize; m_isIconized = iconize;
(void)SendIconizeEvent(iconize); (void)SendIconizeEvent(iconize);
} }
else
{
// this is not supposed to happen if we're called only from
// gtk_frame_(un)map_callback!
// RR: I don't understand this test. Upon startup, the frame is
// not iconized by default, it has just not been created
// yet.
///wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") );
}
} }