projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully fixed library names generated by wx-config for OS/2's PM port.
[wxWidgets.git]
/
src
/
xrc
/
xh_frame.cpp
diff --git
a/src/xrc/xh_frame.cpp
b/src/xrc/xh_frame.cpp
index 2685be16e06aeee8192317d869a7a5ef6e81fede..98d996fd1347d467b647b47c107730d7bdc3e1e2 100644
(file)
--- a/
src/xrc/xh_frame.cpp
+++ b/
src/xrc/xh_frame.cpp
@@
-8,7
+8,7
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "xh_frame.h"
#endif
#pragma implementation "xh_frame.h"
#endif
@@
-52,6
+52,7
@@
wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
XRC_ADD_STYLE(wxNO_3D);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
XRC_ADD_STYLE(wxNO_3D);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+ XRC_ADD_STYLE(wxFRAME_EX_METAL);
AddWindowStyles();
}
AddWindowStyles();
}
@@
-68,9
+69,11
@@
wxObject *wxFrameXmlHandler::DoCreateResource()
GetName());
if (HasParam(wxT("size")))
GetName());
if (HasParam(wxT("size")))
- frame->SetClientSize(GetSize());
+ frame->SetClientSize(GetSize(
wxT("size"), frame
));
if (HasParam(wxT("pos")))
frame->Move(GetPosition());
if (HasParam(wxT("pos")))
frame->Move(GetPosition());
+ if (HasParam(wxT("icon")))
+ frame->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
SetupWindow(frame);
SetupWindow(frame);