projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing file paths after renaming
[wxWidgets.git]
/
src
/
os2
/
window.cpp
diff --git
a/src/os2/window.cpp
b/src/os2/window.cpp
index 44fdde685bfa3403f14fae76a6e9e40086809300..444a0756c2312a3224852fa1a1a630ac1fdde6c4 100644
(file)
--- a/
src/os2/window.cpp
+++ b/
src/os2/window.cpp
@@
-51,6
+51,8
@@
#include <stdio.h>
#endif
#include <stdio.h>
#endif
+#include "wx/os2/dcclient.h"
+
#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
@@
-121,7
+123,7
@@
QMSG s_currentMsg;
#if wxUSE_MENUS_NATIVE
QMSG s_currentMsg;
#if wxUSE_MENUS_NATIVE
-
wxMenu* wxCurrentPopupMenu = NULL
;
+
extern wxMenu* wxCurrentPopupMenu
;
#endif // wxUSE_MENUS_NATIVE
// ---------------------------------------------------------------------------
#endif // wxUSE_MENUS_NATIVE
// ---------------------------------------------------------------------------
@@
-1082,7
+1084,7
@@
void wxWindowOS2::OnIdle(
,vPoint.y
,nState
);
,vPoint.y
,nState
);
- (void)
GetEventHandler()->Process
Event(rEvent);
+ (void)
HandleWindow
Event(rEvent);
}
}
if (wxUpdateUIEvent::CanUpdate(this))
}
}
if (wxUpdateUIEvent::CanUpdate(this))
@@
-1092,7
+1094,7
@@
void wxWindowOS2::OnIdle(
//
// Set this window to be the child of 'parent'.
//
//
// Set this window to be the child of 'parent'.
//
-bool wxWindowOS2::Reparent( wxWindow* pParent)
+bool wxWindowOS2::Reparent( wxWindow
Base
* pParent)
{
if (!wxWindowBase::Reparent(pParent))
return false;
{
if (!wxWindowBase::Reparent(pParent))
return false;
@@
-1109,12
+1111,12
@@
void wxWindowOS2::Update()
::WinUpdateWindow(GetHwnd());
} // end of wxWindowOS2::Update
::WinUpdateWindow(GetHwnd());
} // end of wxWindowOS2::Update
-void wxWindowOS2::Freeze()
+void wxWindowOS2::
Do
Freeze()
{
::WinSendMsg(GetHwnd(), WM_VRNDISABLED, (MPARAM)0, (MPARAM)0);
} // end of wxWindowOS2::Freeze
{
::WinSendMsg(GetHwnd(), WM_VRNDISABLED, (MPARAM)0, (MPARAM)0);
} // end of wxWindowOS2::Freeze
-void wxWindowOS2::Thaw()
+void wxWindowOS2::
Do
Thaw()
{
::WinSendMsg(GetHwnd(), WM_VRNENABLED, (MPARAM)TRUE, (MPARAM)0);
{
::WinSendMsg(GetHwnd(), WM_VRNENABLED, (MPARAM)TRUE, (MPARAM)0);
@@
-1620,7
+1622,7
@@
void wxWindowOS2::DoSetClientSize( int nWidth,
wxSize size( nWidth, nHeight );
wxSizeEvent vEvent( size, m_windowId );
vEvent.SetEventObject(this);
wxSize size( nWidth, nHeight );
wxSizeEvent vEvent( size, m_windowId );
vEvent.SetEventObject(this);
-
GetEventHandler()->Process
Event(vEvent);
+
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::DoSetClientSize
// ---------------------------------------------------------------------------
} // end of wxWindowOS2::DoSetClientSize
// ---------------------------------------------------------------------------
@@
-1784,10
+1786,6
@@
bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
bool bIsWaiting = true;
int nHeight;
bool bIsWaiting = true;
int nHeight;
- // Protect against recursion
- if (wxCurrentPopupMenu)
- return false;
-
pMenu->SetInvokingWindow(this);
pMenu->UpdateUI();
pMenu->SetInvokingWindow(this);
pMenu->UpdateUI();
@@
-1804,7
+1802,6
@@
bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
DoGetSize(0,&nHeight);
nY = nHeight - nY;
}
DoGetSize(0,&nHeight);
nY = nHeight - nY;
}
- wxCurrentPopupMenu = pMenu;
::WinPopupMenu( hWndParent
,hWndOwner
::WinPopupMenu( hWndParent
,hWndOwner
@@
-1825,7
+1822,6
@@
bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
}
::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
}
- wxCurrentPopupMenu = NULL;
pMenu->SetInvokingWindow(NULL);
return true;
} // end of wxWindowOS2::DoPopupMenu
pMenu->SetInvokingWindow(NULL);
return true;
} // end of wxWindowOS2::DoPopupMenu
@@
-2001,7
+1997,7
@@
bool wxWindowOS2::OS2ProcessMessage( WXMSG* pMsg )
vEvent.SetWindowChange(bWindowChange);
vEvent.SetEventObject(this);
vEvent.SetWindowChange(bWindowChange);
vEvent.SetEventObject(this);
- if (
GetEventHandler()->Process
Event(vEvent))
+ if (
HandleWindow
Event(vEvent))
{
wxButton* pBtn = wxDynamicCast(FindFocus(), wxButton);
{
wxButton* pBtn = wxDynamicCast(FindFocus(), wxButton);
@@
-2941,6
+2937,7
@@
bool wxWindowOS2::OS2Create( PSZ zClass,
long lControlId = 0L;
wxWindowCreationHook vHook(this);
wxString sClassName((wxChar*)zClass);
long lControlId = 0L;
wxWindowCreationHook vHook(this);
wxString sClassName((wxChar*)zClass);
+ wxString sTitle(zTitle ? zTitle : wxEmptyString);
OS2GetCreateWindowCoords( rPos
,rSize
OS2GetCreateWindowCoords( rPos
,rSize
@@
-2969,7
+2966,7
@@
bool wxWindowOS2::OS2Create( PSZ zClass,
}
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent()
,sClassName.c_str()
}
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent()
,sClassName.c_str()
- ,
(zTitle ? zTitle : wxEmptyString
)
+ ,
sTitle.c_str(
)
,(ULONG)dwStyle
,(LONG)0L
,(LONG)0L
,(ULONG)dwStyle
,(LONG)0L
,(LONG)0L
@@
-3026,7
+3023,7
@@
bool wxWindowOS2::HandleCreate( WXLPCREATESTRUCT WXUNUSED(vCs),
{
wxWindowCreateEvent vEvent((wxWindow*)this);
{
wxWindowCreateEvent vEvent((wxWindow*)this);
- (void)
GetEventHandler()->Process
Event(vEvent);
+ (void)
HandleWindow
Event(vEvent);
*pbMayCreate = true;
return true;
} // end of wxWindowOS2::HandleCreate
*pbMayCreate = true;
return true;
} // end of wxWindowOS2::HandleCreate
@@
-3035,7
+3032,7
@@
bool wxWindowOS2::HandleDestroy()
{
wxWindowDestroyEvent vEvent((wxWindow*)this);
vEvent.SetId(GetId());
{
wxWindowDestroyEvent vEvent((wxWindow*)this);
vEvent.SetId(GetId());
- (void)
GetEventHandler()->Process
Event(vEvent);
+ (void)
HandleWindow
Event(vEvent);
//
// Delete our drop target if we've got one
//
// Delete our drop target if we've got one
@@
-3074,7
+3071,7
@@
bool wxWindowOS2::HandleActivate(
,m_windowId
);
vEvent.SetEventObject(this);
,m_windowId
);
vEvent.SetEventObject(this);
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleActivate
bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )
} // end of wxWindowOS2::HandleActivate
bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )
@@
-3084,7
+3081,7
@@
bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )
// purposes that we got it
//
wxChildFocusEvent vEventFocus((wxWindow *)this);
// purposes that we got it
//
wxChildFocusEvent vEventFocus((wxWindow *)this);
- (void)
GetEventHandler()->Process
Event(vEventFocus);
+ (void)
HandleWindow
Event(vEventFocus);
#if wxUSE_CARET
//
#if wxUSE_CARET
//
@@
-3108,7
+3105,7
@@
bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )
wxFocusEvent vEvent(wxEVT_SET_FOCUS, m_windowId);
vEvent.SetEventObject(this);
wxFocusEvent vEvent(wxEVT_SET_FOCUS, m_windowId);
vEvent.SetEventObject(this);
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleSetFocus
bool wxWindowOS2::HandleKillFocus( WXHWND hWnd )
} // end of wxWindowOS2::HandleSetFocus
bool wxWindowOS2::HandleKillFocus( WXHWND hWnd )
@@
-3155,7
+3152,7
@@
bool wxWindowOS2::HandleKillFocus( WXHWND hWnd )
// wxFindWinFromHandle() may return NULL, it is ok
//
vEvent.SetWindow(wxFindWinFromHandle(hWnd));
// wxFindWinFromHandle() may return NULL, it is ok
//
vEvent.SetWindow(wxFindWinFromHandle(hWnd));
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleKillFocus
// ---------------------------------------------------------------------------
} // end of wxWindowOS2::HandleKillFocus
// ---------------------------------------------------------------------------
@@
-3170,7
+3167,7
@@
bool wxWindowOS2::HandleShow(
wxShowEvent vEvent(GetId(), bShow);
vEvent.SetEventObject(this);
wxShowEvent vEvent(GetId(), bShow);
vEvent.SetEventObject(this);
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleShow
bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) )
} // end of wxWindowOS2::HandleShow
bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) )
@@
-3178,7
+3175,7
@@
bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) )
wxInitDialogEvent vEvent(GetId());
vEvent.SetEventObject(this);
wxInitDialogEvent vEvent(GetId());
vEvent.SetEventObject(this);
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleInitDialog
bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam))
} // end of wxWindowOS2::HandleInitDialog
bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam))
@@
-3205,7
+3202,7
@@
bool wxWindowOS2::OS2OnDrawItem( int vId,
WXDRAWITEMSTRUCT* pItemStruct )
{
#if wxUSE_OWNER_DRAWN
WXDRAWITEMSTRUCT* pItemStruct )
{
#if wxUSE_OWNER_DRAWN
- wx
DC vDc
;
+ wx
ClientDC vDc(this)
;
#if wxUSE_MENUS_NATIVE
//
#if wxUSE_MENUS_NATIVE
//
@@
-3224,8
+3221,10
@@
bool wxWindowOS2::OS2OnDrawItem( int vId,
,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft
,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
);
,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft
,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
);
- vDc.SetHDC( hDC, false );
- vDc.SetHPS( pMeasureStruct->hps );
+
+ wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+ impl->SetHDC( hDC, false );
+ impl->SetHPS( pMeasureStruct->hps );
//
// Load the wxWidgets Pallete and set to RGB mode
//
//
// Load the wxWidgets Pallete and set to RGB mode
//
@@
-3415,7
+3414,7
@@
bool wxWindowOS2::HandleSysColorChange()
wxSysColourChangedEvent vEvent;
vEvent.SetEventObject(this);
wxSysColourChangedEvent vEvent;
vEvent.SetEventObject(this);
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleSysColorChange
bool wxWindowOS2::HandleCtlColor( WXHBRUSH* WXUNUSED(phBrush) )
} // end of wxWindowOS2::HandleSysColorChange
bool wxWindowOS2::HandleCtlColor( WXHBRUSH* WXUNUSED(phBrush) )
@@
-3448,7
+3447,7
@@
bool wxWindowOS2::HandlePaletteChanged()
vEvent.SetEventObject(this);
vEvent.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
vEvent.SetEventObject(this);
vEvent.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandlePaletteChanged
//
} // end of wxWindowOS2::HandlePaletteChanged
//
@@
-3472,7
+3471,7
@@
void wxWindowOS2::OnSysColourChanged(
wxSysColourChangedEvent vEvent;
rEvent.SetEventObject(pWin);
wxSysColourChangedEvent vEvent;
rEvent.SetEventObject(pWin);
- pWin->
GetEventHandler()->Process
Event(vEvent);
+ pWin->
HandleWindow
Event(vEvent);
}
node = node->GetNext();
}
}
node = node->GetNext();
}
@@
-3486,7
+3485,7
@@
void wxWindow::OnPaint (
wxPaintEvent& rEvent
)
{
wxPaintEvent& rEvent
)
{
- HDC hDC = (HDC)wxPaintDC::FindDCInCache((wxWindow*) rEvent.GetEventObject());
+ HDC hDC = (HDC)wxPaintDC
Impl
::FindDCInCache((wxWindow*) rEvent.GetEventObject());
if (hDC != 0)
{
if (hDC != 0)
{
@@
-3557,7
+3556,7
@@
bool wxWindowOS2::HandlePaint()
m_updateRegion = wxRegion(hRgn, hPS);
vEvent.SetEventObject(this);
m_updateRegion = wxRegion(hRgn, hPS);
vEvent.SetEventObject(this);
- bProcessed =
GetEventHandler()->Process
Event(vEvent);
+ bProcessed =
HandleWindow
Event(vEvent);
if (!bProcessed &&
IsKindOf(CLASSINFO(wxPanel)) &&
if (!bProcessed &&
IsKindOf(CLASSINFO(wxPanel)) &&
@@
-3671,25
+3670,26
@@
bool wxWindowOS2::HandleEraseBkgnd( WXHDC hDC )
if (vSwp.fl & SWP_MINIMIZE)
return true;
if (vSwp.fl & SWP_MINIMIZE)
return true;
- wx
DC vDC
;
-
- vDC.m_hPS = (HPS)hDC; // this is really a PS
- vDC.SetWindow((wxWindow*)this);
+ wx
ClientDC vDC(this)
;
+ wxPMDCImpl *impl = (wxPMDCImpl*) vDC.GetImpl();
+ impl->SetHDC(hDC);
+ impl->SetHPS((HPS)hDC); // this is really a PS
wxEraseEvent vEvent(m_windowId, &vDC);
vEvent.SetEventObject(this);
wxEraseEvent vEvent(m_windowId, &vDC);
vEvent.SetEventObject(this);
- rc =
GetEventHandler()->Process
Event(vEvent);
+ rc =
HandleWindow
Event(vEvent);
-
vDC.m_hPS = NULLHANDLE
;
+
impl->SetHPS(NULLHANDLE)
;
return true;
} // end of wxWindowOS2::HandleEraseBkgnd
void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent)
{
RECTL vRect;
return true;
} // end of wxWindowOS2::HandleEraseBkgnd
void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent)
{
RECTL vRect;
- HPS hPS = rEvent.GetDC()->GetHPS();
+ wxPMDCImpl *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl();
+ HPS hPS = impl->GetHPS();
APIRET rc;
LONG lColor = m_backgroundColour.GetPixel();
APIRET rc;
LONG lColor = m_backgroundColour.GetPixel();
@@
-3706,7
+3706,7
@@
bool wxWindowOS2::HandleMinimize()
wxIconizeEvent vEvent(m_windowId);
vEvent.SetEventObject(this);
wxIconizeEvent vEvent(m_windowId);
vEvent.SetEventObject(this);
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleMinimize
bool wxWindowOS2::HandleMaximize()
} // end of wxWindowOS2::HandleMinimize
bool wxWindowOS2::HandleMaximize()
@@
-3714,7
+3714,7
@@
bool wxWindowOS2::HandleMaximize()
wxMaximizeEvent vEvent(m_windowId);
vEvent.SetEventObject(this);
wxMaximizeEvent vEvent(m_windowId);
vEvent.SetEventObject(this);
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleMaximize
bool wxWindowOS2::HandleMove( int nX, int nY )
} // end of wxWindowOS2::HandleMaximize
bool wxWindowOS2::HandleMove( int nX, int nY )
@@
-3723,7
+3723,7
@@
bool wxWindowOS2::HandleMove( int nX, int nY )
wxMoveEvent vEvent(pt, m_windowId);
vEvent.SetEventObject(this);
wxMoveEvent vEvent(pt, m_windowId);
vEvent.SetEventObject(this);
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleMove
bool wxWindowOS2::HandleSize( int nWidth,
} // end of wxWindowOS2::HandleMove
bool wxWindowOS2::HandleSize( int nWidth,
@@
-3734,7
+3734,7
@@
bool wxWindowOS2::HandleSize( int nWidth,
wxSizeEvent vEvent(sz, m_windowId);
vEvent.SetEventObject(this);
wxSizeEvent vEvent(sz, m_windowId);
vEvent.SetEventObject(this);
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::HandleSize
bool wxWindowOS2::HandleGetMinMaxInfo( PSWP pSwp )
} // end of wxWindowOS2::HandleSize
bool wxWindowOS2::HandleGetMinMaxInfo( PSWP pSwp )
@@
-3879,7
+3879,7
@@
bool wxWindowOS2::HandleMouseEvent( WXUINT uMsg,
,uFlags
);
,uFlags
);
- bProcessed =
GetEventHandler()->Process
Event(vEvent);
+ bProcessed =
HandleWindow
Event(vEvent);
if (!bProcessed)
{
HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR();
if (!bProcessed)
{
HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR();
@@
-3913,7
+3913,7
@@
bool wxWindowOS2::HandleMouseMove( int nX,
,uFlags
);
,uFlags
);
- (void)
GetEventHandler()->Process
Event(vEvent);
+ (void)
HandleWindow
Event(vEvent);
}
return HandleMouseEvent( WM_MOUSEMOVE
,nX
}
return HandleMouseEvent( WM_MOUSEMOVE
,nX
@@
-4035,7
+4035,7
@@
bool wxWindowOS2::HandleChar( WXWPARAM WXUNUSED(wParam),
vEvent.m_controlDown = true;
}
vEvent.m_controlDown = true;
}
- return (
GetEventHandler()->Process
Event(vEvent));
+ return (
HandleWindow
Event(vEvent));
}
bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam,
}
bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam,
@@
-4059,7
+4059,7
@@
bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam,
,(MPARAM)wParam
));
,(MPARAM)wParam
));
- if (
GetEventHandler()->Process
Event(vEvent))
+ if (
HandleWindow
Event(vEvent))
{
return true;
}
{
return true;
}
@@
-4088,7
+4088,7
@@
bool wxWindowOS2::HandleKeyUp( WXWPARAM wParam,
,(MPARAM)wParam
));
,(MPARAM)wParam
));
- if (
GetEventHandler()->Process
Event(vEvent))
+ if (
HandleWindow
Event(vEvent))
return true;
}
return false;
return true;
}
return false;
@@
-4154,7
+4154,7
@@
bool wxWindowOS2::OS2OnScroll( int nOrientation,
default:
return false;
}
default:
return false;
}
- return
GetEventHandler()->Process
Event(vEvent);
+ return
HandleWindow
Event(vEvent);
} // end of wxWindowOS2::OS2OnScroll
//
} // end of wxWindowOS2::OS2OnScroll
//
projects / wxWidgets.git / blobdiff