EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
EVT_INIT_DIALOG(wxWindow::OnInitDialog)
EVT_IDLE(wxWindow::OnIdle)
+ EVT_SET_FOCUS(wxWindow::OnSetFocus)
END_EVENT_TABLE()
// ===========================================================================
if (m_hWnd)
{
-// UnsubclassWin();
-
if(!::WinDestroyWindow(GetHWND()))
wxLogLastError(wxT("DestroyWindow"));
//
)
{
HWND hParent = NULLHANDLE;
+ wxPoint vPos = rPos; // The OS/2 position
wxCHECK_MSG(pParent, FALSE, wxT("can't create wxWindow without parent"));
{
pParent->AddChild(this);
hParent = GetWinHwnd(pParent);
+ //
+ // OS2 uses normal coordinates, no bassackwards Windows ones
+ //
+ vPos.y = pParent->GetSize().y - (vPos.y + rSize.y);
}
else
- hParent = HWND_DESKTOP;
+ {
+ RECTL vRect;
+
+ ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+ hParent = HWND_DESKTOP;
+ vPos.y = vRect.yTop - (vPos.y + rSize.y);
+ }
ULONG ulCreateFlags = 0L;
// set in those class create procs. PM's basic windows styles are
// very limited.
//
+ ulCreateFlags |= WS_VISIBLE;
+
+
+ if ( lStyle & wxCLIP_SIBLINGS )
+ ulCreateFlags |= WS_CLIPSIBLINGS;
+
if (lStyle & wxCLIP_CHILDREN )
ulCreateFlags |= WS_CLIPCHILDREN;
,(PSZ)wxCanvasClassName
,rName.c_str()
,ulCreateFlags
- ,rPos.x
- ,rPos.y
+ ,vPos.x
+ ,vPos.y
,WidthDefault(rSize.x)
,HeightDefault(rSize.y)
,NULLHANDLE
HWND hwnd = (HWND)hWnd;
wxASSERT_MSG( !m_fnOldWndProc, wxT("subclassing window twice?") );
-
wxCHECK_RET(::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in SubclassWin") );
-
-// wxAssociateWinWithHandle(hwnd, this);
-
m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc);
-// ::WinSetWindowULong(hwnd, QWL_USER, (ULONG)wxWndProc);
} // end of wxWindow::SubclassWin
void wxWindow::UnsubclassWin()
{
-// wxRemoveHandleAssociation(this);
-
//
// Restore old Window proc
//
if (m_hWnd)
{
-// m_hWnd = 0;
-
wxCHECK_RET( ::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in UnsubclassWin") );
PFNWP fnProc = (PFNWP)::WinQueryWindowPtr(hwnd, QWP_PFNWP);
+
if ( (m_fnOldWndProc != 0) && (fnProc != (PFNWP) m_fnOldWndProc))
{
WinSubclassWindow(hwnd, (PFNWP)m_fnOldWndProc);
RECTL vRect;
hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
- ::WinQueryWindowRect(hWndClient, &vRect);
+ if( hWndClient == NULLHANDLE)
+ ::WinQueryWindowRect(GetHwnd(), &vRect);
+ else
+ ::WinQueryWindowRect(hWndClient, &vRect);
if (pWidth)
*pWidth = vRect.xRight;
hPs = ::WinGetPS(GetHwnd());
if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics))
+ {
+ ::WinReleasePS(hPs);
return (0);
- else
- return(vFontMetrics.lMaxAscender + vFontMetrics.lMaxDescender);
+ }
::WinReleasePS(hPs);
+ return(vFontMetrics.lMaxAscender + vFontMetrics.lMaxDescender);
} // end of wxWindow::GetCharHeight
int wxWindow::GetCharWidth() const
hPs = ::WinGetPS(GetHwnd());
if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics))
+ {
+ ::WinReleasePS(hPs);
return (0);
- else
- return(vFontMetrics.lAveCharWidth);
+ }
::WinReleasePS(hPs);
+ return(vFontMetrics.lAveCharWidth);
} // end of wxWindow::GetCharWidth
void wxWindow::GetTextExtent(
WXMSG* pMsg
)
{
- return m_acceleratorTable.Translate(m_hWnd, pMsg);
+#if wxUSE_ACCEL
+ return m_acceleratorTable.Translate(m_hWnd, pMsg);
+#else
+ return FALSE;
+#endif //wxUSE_ACCEL
} // end of wxWindow::OS2TranslateMessage
// ---------------------------------------------------------------------------
, WORD* pCmd
)
{
-/*
- *pId = LOWORD(wParam);
- *phWnd = (WXHWND)lParam;
- *pCmd = HIWORD(wParam);
-*/
*pId = LOWORD(wParam);
*phWnd = NULL; // or may be GetHWND() ?
*pCmd = LOWORD(lParam);
WXHICON hIcon;
WXHBRUSH hBrush;
- //
- // The return value
- //
-// union
-// {
-// bool bAllow;
-// MRESULT mResult;
-// WXHICON hIcon;
-// WXHBRUSH hBrush;
-// } vRc;
-
//
// For most messages we should return 0 when we do process the message
//
case WM_DRAWITEM:
case WM_MEASUREITEM:
{
- int idCtrl = (UINT)wParam;
+ int nIdCtrl = (UINT)wParam;
+
if ( uMsg == WM_DRAWITEM )
{
- bProcessed = OS2OnDrawItem(idCtrl,
+ bProcessed = OS2OnDrawItem(nIdCtrl,
(WXDRAWITEMSTRUCT *)lParam);
}
else
{
- bProcessed = OS2OnMeasureItem(idCtrl,
+ bProcessed = OS2OnMeasureItem(nIdCtrl,
(WXMEASUREITEMSTRUCT *)lParam);
}
}
break;
#endif
+ case WM_ERASEBACKGROUND:
+ //
+ // Returning TRUE to requestw PM to paint the window background
+ // in SYSCLR_WINDOW. We don't really want that
+ //
+ bProcessed = HandleEraseBkgnd((WXHDC)(HPS)wParam);
+ mResult = (MRESULT)(FALSE);
+ break;
+
//
// Instead of CTLCOLOR messages PM sends QUERYWINDOWPARAMS to
// things such as colors and fonts and such
bProcessed = HandlePresParamChanged(wParam);
break;
- // move this to wxFrame
- case WM_ERASEBACKGROUND:
- bProcessed = HandleEraseBkgnd((WXHDC)(HDC)wParam);
- if (bProcessed)
- {
- //
- // We processed the message, i.e. erased the background
- //
- mResult = (MRESULT)TRUE;
- }
- break;
// move all drag and drops to wxDrg
case WM_ENDDRAG:
}
break;
}
-
if (!bProcessed)
{
#ifdef __WXDEBUG__
wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."),
wxGetMessageName(uMsg));
#endif // __WXDEBUG__
- mResult = OS2DefWindowProc(uMsg, wParam, lParam);
+ if (IsKindOf(CLASSINFO(wxFrame)))
+ mResult = ::WinDefWindowProc(m_hWnd, uMsg, wParam, lParam);
+ else
+ mResult = OS2DefWindowProc(uMsg, wParam, lParam);
}
return mResult;
} // end of wxWindow::OS2WindowProc
long lWidth1 = 20L;
long lHeight1 = 20L;
int nControlId = 0;
+ int nNeedsubclass = 0;
+ PCSZ pszClass = zClass;
//
// Find parent's size, if it exists, to set up a possible default
{
nControlId = ulId;
}
+ else
+ {
+ // no standard controls
+ if(wxString (wxT("wxFrameClass")) == wxString(zClass) )
+ {
+ pszClass = WC_FRAME;
+ nNeedsubclass = 1;
+ }
+ else
+ {
+ nControlId = ulId;
+ if(nControlId < 0)
+ nControlId = FID_CLIENT;
+ }
+ }
//
// We will either have a registered class via string name or a standard PM Class via a long
,(LONG)lY1
,(LONG)lWidth
,(LONG)lHeight
- ,NULLHANDLE
+ ,hOwner
,HWND_TOP
- ,(ULONG)ulId
+ ,(ULONG)nControlId
,pCtlData
,pPresParams
);
//
// Now need to subclass window.
//
-
- SubclassWin(GetHWND());
-
+ if(!nNeedsubclass)
+ {
+ wxAssociateWinWithHandle((HWND)m_hWnd,this);
+ }
+ else
+ {
+ SubclassWin(GetHWND());
+ }
return TRUE;
} // end of wxWindow::OS2Create
, WXDRAWITEMSTRUCT* pItemStruct
)
{
- //
- // I'll get to owner drawn stuff later
- //
+ wxDC vDc;
+#if wxUSE_OWNER_DRAWN
//
- // is it a menu item or control?
+ // Is it a menu item?
//
- wxWindow* pItem = FindItem(vId);
-
-#if wxUSE_OWNER_DRAWN
- if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
- {
- return ((wxControl *)pItem)->OS2OnDraw(pItemStruct);
- }
- else if (pItem && pItem->IsKindOf(CLASSINFO(wxMenu)))
+ if (vId == 0)
{
- /*
- // TODO: draw a menu item
+ ERRORID vError;
+ wxString sError;
+ POWNERITEM pMeasureStruct = (POWNERITEM)pItemStruct;
+ wxFrame* pFrame = (wxFrame*)this;
+ wxMenuItem* pMenuItem = pFrame->GetMenuBar()->FindItem(pMeasureStruct->idItem, pMeasureStruct->hItem);
+ HDC hDC = ::GpiQueryDevice(pMeasureStruct->hps);
+ wxRect vRect( pMeasureStruct->rclItem.xLeft
+ ,pMeasureStruct->rclItem.yBottom
+ ,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft
+ ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
+ );
+ vDc.SetHDC( hDC
+ ,FALSE
+ );
+ vDc.SetHPS(pMeasureStruct->hps);
+ //
+ // Load the wxWindows Pallete and set to RGB mode
+ //
+ if (!::GpiCreateLogColorTable( pMeasureStruct->hps
+ ,0L
+ ,LCOLF_CONSECRGB
+ ,0L
+ ,(LONG)wxTheColourDatabase->m_nSize
+ ,(PLONG)wxTheColourDatabase->m_palTable
+ ))
+ {
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Unable to set current color table. Error: %s\n", sError);
+ }
+ //
+ // Set the color table to RGB mode
//
- POWNERITEM pDrawStruct = (OWNERITEM *)pItemStruct;
- wxMenuItem* pMenuItem = (wxMenuItem *)(pDrawStruct->pItemData);
+ if (!::GpiCreateLogColorTable( pMeasureStruct->hps
+ ,0L
+ ,LCOLF_RGB
+ ,0L
+ ,0L
+ ,NULL
+ ))
+ {
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Unable to set current color table. Error: %s\n", sError);
+ }
+
+ wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
+
- wxCHECK(pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE);
+ int eAction = 0;
+ int eStatus = 0;
+ if (pMeasureStruct->fsAttribute == pMeasureStruct->fsAttributeOld)
+ {
+ //
+ // Entire Item needs to be redrawn (either it has reappeared from
+ // behind another window or is being displayed for the first time
+ //
+ eAction = wxOwnerDrawn::wxODDrawAll;
+
+ if (pMeasureStruct->fsAttribute & MIA_HILITED)
+ {
+ //
+ // If it is currently selected we let the system handle it
+ //
+ eStatus |= wxOwnerDrawn::wxODSelected;
+ }
+ if (pMeasureStruct->fsAttribute & MIA_CHECKED)
+ {
+ //
+ // If it is currently checked we draw our own
+ //
+ eStatus |= wxOwnerDrawn::wxODChecked;
+ pMeasureStruct->fsAttributeOld = pMeasureStruct->fsAttribute &= ~MIA_CHECKED;
+ }
+ if (pMeasureStruct->fsAttribute & MIA_DISABLED)
+ {
+ //
+ // If it is currently disabled we let the system handle it
+ //
+ eStatus |= wxOwnerDrawn::wxODDisabled;
+ }
+ //
+ // Don't really care about framed (indicationg focus) or NoDismiss
+ //
+ }
+ else
+ {
+ if (pMeasureStruct->fsAttribute & MIA_HILITED)
+ {
+ eAction = wxOwnerDrawn::wxODDrawAll;
+ eStatus |= wxOwnerDrawn::wxODSelected;
+ //
+ // Keep the system from trying to highlight with its bogus colors
+ //
+ pMeasureStruct->fsAttributeOld = pMeasureStruct->fsAttribute &= ~MIA_HILITED;
+ }
+ else if (!(pMeasureStruct->fsAttribute & MIA_HILITED))
+ {
+ eAction = wxOwnerDrawn::wxODDrawAll;
+ eStatus = 0;
+ //
+ // Keep the system from trying to highlight with its bogus colors
+ //
+ pMeasureStruct->fsAttribute = pMeasureStruct->fsAttributeOld &= ~MIA_HILITED;
+ }
+ else
+ {
+ //
+ // For now we don't care about anything else
+ // just ignore the entire message!
+ //
+ return TRUE;
+ }
+ }
//
- // Prepare to call OnDrawItem()
+ // Now redraw the item
+ //
+ return(pMenuItem->OnDrawItem( vDc
+ ,vRect
+ ,(wxOwnerDrawn::wxODAction)eAction
+ ,(wxOwnerDrawn::wxODStatus)eStatus
+ ));
+ //
+ // leave the fsAttribute and fsOldAttribute unchanged. If different,
+ // the system will do the highlight or fraeming or disabling for us,
+ // otherwise, we'd have to do it ourselves.
//
- HPSdc;
- dc.SetHDC((WXHDC)pDrawStruct->hDC, FALSE);
- wxRect rect(pDrawStruct->rcItem.left, pDrawStruct->rcItem.top,
- pDrawStruct->rcItem.right - pDrawStruct->rcItem.left,
- pDrawStruct->rcItem.bottom - pDrawStruct->rcItem.top);
-
- return pMenuItem->OnDrawItem
- (
- dc, rect,
- (wxOwnerDrawn::wxODAction)pDrawStruct->itemAction,
- (wxOwnerDrawn::wxODStatus)pDrawStruct->itemState
- );
- */
}
- else
- return FALSE;
+ wxWindow* pItem = FindItem(vId);
+
+ if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
+ {
+ return ((wxControl *)pItem)->OS2OnDraw(pItemStruct);
+ }
#endif
- return TRUE;
+ return FALSE;
} // end of wxWindow::OS2OnDrawItem
-bool wxWindow::OS2OnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
+bool wxWindow::OS2OnMeasureItem(
+ int lId
+, WXMEASUREITEMSTRUCT* pItemStruct
+)
{
- // TODO: more owner drawn menu related stuff, get to it later
-/*
-#if wxUSE_OWNER_DRAWN
- // is it a menu item?
- if ( id == 0 )
+ //
+ // Is it a menu item?
+ //
+ if (lId == 65536) // I really don't like this...has to be a better indicator
{
- MEASUREITEMSTRUCT *pMeasureStruct = (MEASUREITEMSTRUCT *)itemStruct;
- wxMenuItem *pMenuItem = (wxMenuItem *)(pMeasureStruct->itemData);
-
- wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
-
- return pMenuItem->OnMeasureItem(&pMeasureStruct->itemWidth,
- &pMeasureStruct->itemHeight);
+ if (IsKindOf(CLASSINFO(wxFrame))) // we'll assume if Frame then a menu
+ {
+ size_t nWidth;
+ size_t nHeight;
+ POWNERITEM pMeasureStruct = (POWNERITEM)pItemStruct;
+ wxFrame* pFrame = (wxFrame*)this;
+ wxMenuItem* pMenuItem = pFrame->GetMenuBar()->FindItem(pMeasureStruct->idItem, pMeasureStruct->hItem);
+
+ wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
+ nWidth = 0L;
+ nHeight = 0L;
+ if (pMenuItem->OnMeasureItem( &nWidth
+ ,&nHeight
+ ))
+ {
+ pMeasureStruct->rclItem.xRight = nWidth;
+ pMeasureStruct->rclItem.xLeft = 0L;
+ pMeasureStruct->rclItem.yTop = nHeight;
+ pMeasureStruct->rclItem.yBottom = 0L;
+ return TRUE;
+ }
+ return FALSE;
+ }
}
+ wxWindow* pItem = FindItem(lId);
- wxWindow *item = FindItem(id);
- if ( item && item->IsKindOf(CLASSINFO(wxControl)) )
+ if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
{
- return ((wxControl *)item)->MSWOnMeasure(itemStruct);
+ return ((wxControl *)pItem)->OS2OnMeasure(pItemStruct);
}
-#endif // owner-drawn menus
-*/
return FALSE;
}
wxLogLastError("CreateRectRgn");
return FALSE;
}
+
m_updateRegion = wxRegion(hRgn);
-/*
- hPS = WinBeginPaint(GetHWND(), 0L, &vRect);
- WinFillRect(hPS, &vRect, SYSCLR_WINDOW);
- WinEndPaint(hPS);
-*/
vEvent.SetEventObject(this);
+ if (!GetEventHandler()->ProcessEvent(vEvent))
+ {
+ HPS hPS;
+
+ hPS = ::WinBeginPaint( GetHwnd()
+ ,NULLHANDLE
+ ,&vRect
+ );
+ if(hPS)
+ {
+ ::GpiCreateLogColorTable( hPS
+ ,0L
+ ,LCOLF_CONSECRGB
+ ,0L
+ ,(LONG)wxTheColourDatabase->m_nSize
+ ,(PLONG)wxTheColourDatabase->m_palTable
+ );
+ ::GpiCreateLogColorTable( hPS
+ ,0L
+ ,LCOLF_RGB
+ ,0L
+ ,0L
+ ,NULL
+ );
+
+ ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
+ ::WinEndPaint(hPS);
+ }
+ }
return (GetEventHandler()->ProcessEvent(vEvent));
} // end of wxWindow::HandlePaint
-bool wxWindow::HandleEraseBkgnd(WXHDC hdc)
+bool wxWindow::HandleEraseBkgnd(
+ WXHDC hDC
+)
{
- // TODO: will have to worry about this later as part of
- // the handling of changed presentation parameters
- /*
- if ( ::IsIconic(GetHwnd()) )
+ SWP vSwp;
+
+ ::WinQueryWindowPos(GetHwnd(), &vSwp);
+ if (vSwp.fl & SWP_MINIMIZE)
return TRUE;
- wxDC dc;
+ wxDC vDC;
+
+ vDC.m_hPS = (HPS)hDC; // this is really a PS
+ vDC.SetWindow(this);
+ vDC.BeginDrawing();
- dc.SetHDC(hdc);
- dc.SetWindow(this);
- dc.BeginDrawing();
+ wxEraseEvent vEvent(m_windowId, &vDC);
- wxEraseEvent event(m_windowId, &dc);
- event.SetEventObject(this);
- bool rc = GetEventHandler()->ProcessEvent(event);
+ vEvent.SetEventObject(this);
- dc.EndDrawing();
- dc.SelectOldObjects(hdc);
- dc.SetHDC((WXHDC) NULL);
- */
+ bool rc = GetEventHandler()->ProcessEvent(vEvent);
+
+ vDC.EndDrawing();
+ vDC.m_hPS = NULLHANDLE;
return TRUE;
} // end of wxWindow::HandleEraseBkgnd
wxEraseEvent& rEvent
)
{
- // TODO:
+ RECTL vRect;
+ HPS hPS = rEvent.m_dc->m_hPS;
+
+ ::WinQueryWindowRect(GetHwnd(), &vRect);
+ ::WinFillRect(hPS, &vRect, m_backgroundColour.GetPixel());
} // end of wxWindow::OnEraseBackground
// ---------------------------------------------------------------------------
// Find the wxWindow at the current mouse position, returning the mouse
// position.
-wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+wxWindow* wxFindWindowAtPointer(
+ wxPoint& rPt
+)
{
return wxFindWindowAtPoint(wxGetMousePosition());
}
-wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+wxWindow* wxFindWindowAtPoint(
+ const wxPoint& rPt
+)
{
-#if 0
- POINT pt2;
- pt2.x = pt.x;
- pt2.y = pt.y;
- HWND hWndHit = ::WindowFromPoint(pt2);
+ POINTL vPt2;
+
+ vPt2.x = rPt.x;
+ vPt2.y = rPt.y;
- wxWindow* win = wxFindWinFromHandle((WXHWND) hWndHit) ;
- HWND hWnd = hWndHit;
+ HWND hWndHit = ::WinWindowFromPoint(HWND_DESKTOP, &vPt2, FALSE);
+ wxWindow* pWin = wxFindWinFromHandle((WXHWND)hWndHit) ;
+ HWND hWnd = hWndHit;
+ //
// Try to find a window with a wxWindow associated with it
- while (!win && (hWnd != 0))
+ //
+ while (!pWin && (hWnd != 0))
{
- hWnd = ::GetParent(hWnd);
- win = wxFindWinFromHandle((WXHWND) hWnd) ;
+ hWnd = ::WinQueryWindow(hWnd, QW_PARENT);
+ pWin = wxFindWinFromHandle((WXHWND)hWnd) ;
}
- return win;
-#endif
- return (wxWindow*)NULL;
+ return pWin;
}
// Get the current mouse position.
wxPoint wxGetMousePosition()
{
-#if 0
- POINT pt;
- GetCursorPos( & pt );
- return wxPoint(pt.x, pt.y);
-#endif
- return wxPoint(0,0);
+ POINTL vPt;
+
+ ::WinQueryPointerPos(HWND_DESKTOP, &vPt);
+ return wxPoint(vPt.x, vPt.y);
}
projects / wxWidgets.git / blobdiff