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

removed Win16 horrors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-21 17:38:55 +00:00
parent 6feaaaedd6
commit 376ccc457c
2 changed files with 16 additions and 1623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
include/wx/msw/minifram.h
View File

@@ -18,12 +18,25 @@
#include "wx/frame.h" #include "wx/frame.h"
#ifdef __WIN32__
class WXDLLEXPORT wxMiniFrame : public wxFrame class WXDLLEXPORT wxMiniFrame : public wxFrame
{ {
public: public:
wxMiniFrame() { } wxMiniFrame() { }
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
const wxString& name = wxFrameNameStr)
{
return Create(parent, id, title, pos, size,
style |
wxFRAME_TOOL_WINDOW |
(parent ? wxFRAME_FLOAT_ON_PARENT : 0), name);
}
wxMiniFrame(wxWindow *parent, wxMiniFrame(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
@@ -32,42 +45,12 @@ public:
long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER, long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
const wxString& name = wxFrameNameStr) const wxString& name = wxFrameNameStr)
{ {
Create(parent, id, title, pos, size, Create(parent, id, title, pos, size, style, name);
style |
wxFRAME_TOOL_WINDOW |
(parent ? wxFRAME_FLOAT_ON_PARENT : 0), name);
} }
protected: protected:
DECLARE_DYNAMIC_CLASS(wxMiniFrame) DECLARE_DYNAMIC_CLASS(wxMiniFrame)
}; };
#else // !Win32
class WXDLLEXPORT wxMiniFrame : public wxFrame
{
public:
wxMiniFrame() { }
wxMiniFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,
const wxString& name = wxFrameNameStr)
{
Create(parent, id, title, pos, size, style, name);
}
virtual ~wxMiniFrame();
virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
DECLARE_DYNAMIC_CLASS(wxMiniFrame)
};
#endif // Win32/!Win32
#endif #endif
// _WX_MINIFRAM_H_ // _WX_MINIFRAM_H_

1590
src/msw/minifram.cpp
View File

File diff suppressed because it is too large Load Diff