projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reset deferred position/size if the window was moved immediately (#10073)
[wxWidgets.git]
/
samples
/
html
/
htmlctrl
/
htmlctrl.cpp
diff --git
a/samples/html/htmlctrl/htmlctrl.cpp
b/samples/html/htmlctrl/htmlctrl.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
775db9c
..
c003f9c
--- a/
samples/html/htmlctrl/htmlctrl.cpp
+++ b/
samples/html/htmlctrl/htmlctrl.cpp
@@
-36,12
+36,6
@@
// resources
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
-// the application icon (under Windows and OS/2 it is in resources and even
-// though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
- #include "../../sample.xpm"
-#endif
-
enum {
ID_BACK = wxID_HIGHEST + 1,
ID_NEXT = wxID_HIGHEST + 2,
enum {
ID_BACK = wxID_HIGHEST + 1,
ID_NEXT = wxID_HIGHEST + 2,
@@
-131,6
+125,9
@@
IMPLEMENT_APP(MyApp)
// 'Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
// 'Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
+ if ( !wxApp::OnInit() )
+ return false;
+
// create the main application window
MyFrame *frame = new MyFrame(_T("wxWebKit Sample"));
// create the main application window
MyFrame *frame = new MyFrame(_T("wxWebKit Sample"));