projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wrong tab order in wxAuiNotebook after dragging.
[wxWidgets.git]
/
include
/
wx
/
os2
/
frame.h
diff --git
a/include/wx/os2/frame.h
b/include/wx/os2/frame.h
index f8bd78661c1b8dd62abb743b3f93fd13f60f2bfe..ed91205802a4b9dec84921d1d88e11955c146376 100644
(file)
--- a/
include/wx/os2/frame.h
+++ b/
include/wx/os2/frame.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: frame.h
+// Name:
wx/os2/
frame.h
// Purpose: wxFrame class
// Author: David Webster
// Modified by:
// Purpose: wxFrame class
// Author: David Webster
// Modified by:
@@
-17,7
+17,7
@@
//
#include "wx/os2/wxrsc.h"
//
#include "wx/os2/wxrsc.h"
-class WXDLL
EXPORT
wxFrame : public wxFrameBase
+class WXDLL
IMPEXP_CORE
wxFrame : public wxFrameBase
{
public:
// construction
{
public:
// construction
@@
-81,7
+81,7
@@
public:
// Status bar
#if wxUSE_STATUSBAR
virtual wxStatusBar* OnCreateStatusBar( int nNumber = 1
// Status bar
#if wxUSE_STATUSBAR
virtual wxStatusBar* OnCreateStatusBar( int nNumber = 1
- ,long lStyle = wxST
_SIZEGRIP
+ ,long lStyle = wxST
B_DEFAULT_STYLE
,wxWindowID vId = 0
,const wxString& rsName = wxStatusLineNameStr
);
,wxWindowID vId = 0
,const wxString& rsName = wxStatusLineNameStr
);
@@
-93,9
+93,9
@@
public:
// TODO: should this go into a wxFrameworkSettings class perhaps?
static void UseNativeStatusBar(bool bUseNative)
// TODO: should this go into a wxFrameworkSettings class perhaps?
static void UseNativeStatusBar(bool bUseNative)
- { m_bUseNativeStatusBar = bUseNative; }
;
+ { m_bUseNativeStatusBar = bUseNative; }
static bool UsesNativeStatusBar()
static bool UsesNativeStatusBar()
- { return m_bUseNativeStatusBar; }
;
+ { return m_bUseNativeStatusBar; }
#endif // wxUSE_STATUSBAR
WXHMENU GetWinMenu() const { return m_hMenu; }
#endif // wxUSE_STATUSBAR
WXHMENU GetWinMenu() const { return m_hMenu; }
@@
-125,8
+125,6
@@
public:
void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
#endif // tooltips
void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
#endif // tooltips
- virtual void SendSizeEvent(void);
-
void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window);
wxWindow *GetClient();
void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window);
wxWindow *GetClient();
@@
-217,6
+215,8
@@
private:
DECLARE_DYNAMIC_CLASS(wxFrame)
};
DECLARE_DYNAMIC_CLASS(wxFrame)
};
+MRESULT EXPENTRY wxFrameWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
+MRESULT EXPENTRY wxFrameMainWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
#endif
// _WX_FRAME_H_
#endif
// _WX_FRAME_H_