projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the correct WXDLLIMPEXT declaration for
[wxWidgets.git]
/
include
/
wx
/
msw
/
frame.h
diff --git
a/include/wx/msw/frame.h
b/include/wx/msw/frame.h
index 4b27759ebfbd27436f6ed0d17b076963d731fe92..c7fb8ed76cfd1435ad3bd5d8083fd83337e6df3d 100644
(file)
--- a/
include/wx/msw/frame.h
+++ b/
include/wx/msw/frame.h
@@
-12,7
+12,7
@@
#ifndef _WX_FRAME_H_
#define _WX_FRAME_H_
#ifndef _WX_FRAME_H_
#define _WX_FRAME_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "frame.h"
#endif
#pragma interface "frame.h"
#endif
@@
-57,7
+57,7
@@
public:
// Toolbar
#if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar(long style = -1,
// Toolbar
#if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar(long style = -1,
- wxWindowID id =
-1
,
+ wxWindowID id =
wxID_ANY
,
const wxString& name = wxToolBarNameStr);
virtual void PositionToolBar();
const wxString& name = wxToolBarNameStr);
virtual void PositionToolBar();
@@
-83,7
+83,9
@@
public:
{ return m_useNativeStatusBar; };
#endif // wxUSE_STATUSBAR
{ return m_useNativeStatusBar; };
#endif // wxUSE_STATUSBAR
+#if wxUSE_MENUS
WXHMENU GetWinMenu() const { return m_hMenu; }
WXHMENU GetWinMenu() const { return m_hMenu; }
+#endif // wxUSE_MENUS
// event handlers
bool HandlePaint();
// event handlers
bool HandlePaint();
@@
-102,6
+104,8
@@
public:
// current size - this has an effect of refreshing the window layout
virtual void SendSizeEvent();
// current size - this has an effect of refreshing the window layout
virtual void SendSizeEvent();
+ virtual wxPoint GetClientAreaOrigin() const;
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
@@
-126,38
+130,35
@@
protected:
bool MSWTranslateMessage(WXMSG* pMsg);
// window proc for the frames
bool MSWTranslateMessage(WXMSG* pMsg);
// window proc for the frames
-
long
MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
WXLRESULT
MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
- // handle WM_INITMENU message
- bool HandleInitMenu
(
);
+ // handle WM_INITMENU
POPUP
message
+ bool HandleInitMenu
Popup(WXHMENU hMenu
);
- virtual bool IsMDIChild() const { return
FALSE
; }
+ virtual bool IsMDIChild() const { return
false
; }
- // get default (wxWi
ndow
s) icon for the frame
+ // get default (wxWi
dget
s) icon for the frame
virtual WXHICON GetDefaultIcon() const;
#if wxUSE_STATUSBAR
static bool m_useNativeStatusBar;
#endif // wxUSE_STATUSBAR
virtual WXHICON GetDefaultIcon() const;
#if wxUSE_STATUSBAR
static bool m_useNativeStatusBar;
#endif // wxUSE_STATUSBAR
- // Data to save/restore when calling ShowFullScreen
- int m_fsStatusBarFields; // 0 for no status bar
-
int m_fsStatusBarHeight
;
- int m_fsToolBarHeight;
+#if wxUSE_MENUS
+ // frame menu, NULL if none
+
WXHMENU m_hMenu
;
+#endif // wxUSE_MENUS
private:
#if wxUSE_TOOLTIPS
WXHWND m_hwndToolTip;
#endif // tooltips
private:
#if wxUSE_TOOLTIPS
WXHWND m_hwndToolTip;
#endif // tooltips
-#ifdef __WXWINCE__
- WXHWND m_commandBar;
-#endif
// used by IconizeChildFrames(), see comments there
bool m_wasMinimized;
DECLARE_EVENT_TABLE()
// used by IconizeChildFrames(), see comments there
bool m_wasMinimized;
DECLARE_EVENT_TABLE()
- DECLARE_DYNAMIC_CLASS(wxFrame)
+ DECLARE_DYNAMIC_CLASS
_NO_COPY
(wxFrame)
};
#endif
};
#endif