projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix so the value given to wxTextEntryDialog::SetValue will actually be
[wxWidgets.git]
/
include
/
wx
/
msw
/
mdi.h
diff --git
a/include/wx/msw/mdi.h
b/include/wx/msw/mdi.h
index 129cd8b40dfb944ab56571ffb7d5c354f4d912f7..d70470724b367696983e4f5415fb12124f2ca789 100644
(file)
--- a/
include/wx/msw/mdi.h
+++ b/
include/wx/msw/mdi.h
@@
-30,8
+30,6
@@
class WXDLLEXPORT wxMDIChildFrame;
class WXDLLEXPORT wxMDIParentFrame : public wxFrame
{
class WXDLLEXPORT wxMDIParentFrame : public wxFrame
{
- DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-
public:
wxMDIParentFrame();
wxMDIParentFrame(wxWindow *parent,
public:
wxMDIParentFrame();
wxMDIParentFrame(wxWindow *parent,
@@
-68,7
+66,7
@@
public:
// just return a new class)
virtual wxMDIClientWindow *OnCreateClient(void);
// just return a new class)
virtual wxMDIClientWindow *OnCreateClient(void);
-// WXHMENU GetWindowHMENU() const { return m_windowMenu; }
+ // MDI windows menu
wxMenu* GetWindowMenu() const { return m_windowMenu; };
void SetWindowMenu(wxMenu* menu) ;
wxMenu* GetWindowMenu() const { return m_windowMenu; };
void SetWindowMenu(wxMenu* menu) ;
@@
-102,6
+100,8
@@
protected:
virtual void InternalSetMenuBar();
#endif // wxUSE_MENUS_NATIVE
virtual void InternalSetMenuBar();
#endif // wxUSE_MENUS_NATIVE
+ virtual WXHICON GetDefaultIcon() const;
+
wxMDIClientWindow * m_clientWindow;
wxMDIChildFrame * m_currentChild;
wxMenu* m_windowMenu;
wxMDIClientWindow * m_clientWindow;
wxMDIChildFrame * m_currentChild;
wxMenu* m_windowMenu;
@@
-113,6
+113,7
@@
private:
friend class WXDLLEXPORT wxMDIChildFrame;
DECLARE_EVENT_TABLE()
friend class WXDLLEXPORT wxMDIChildFrame;
DECLARE_EVENT_TABLE()
+ DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
};
// ---------------------------------------------------------------------------
};
// ---------------------------------------------------------------------------
@@
-178,6
+179,8
@@
protected:
virtual void InternalSetMenuBar();
virtual bool IsMDIChild() const { return TRUE; }
virtual void InternalSetMenuBar();
virtual bool IsMDIChild() const { return TRUE; }
+ virtual WXHICON GetDefaultIcon() const;
+
// common part of all ctors
void Init();
// common part of all ctors
void Init();