-/////////////////////////////////////////////////////////////////////////////
// Name: windows.cpp
// Purpose: wxWindow
// Author: David Webster
#include "wx/app.h"
#include "wx/panel.h"
#include "wx/layout.h"
+ #include "wx/checkbox.h"
+ #include "wx/combobox.h"
#include "wx/dialog.h"
#include "wx/frame.h"
#include "wx/listbox.h"
#include "wx/button.h"
+ #include "wx/bmpbuttn.h"
#include "wx/msgdlg.h"
-
+ #include "wx/scrolwin.h"
+ #include "wx/radiobox.h"
+ #include "wx/radiobut.h"
+ #include "wx/slider.h"
+ #include "wx/statbox.h"
+ #include "wx/statusbr.h"
+ #include "wx/toolbar.h"
+ #include "wx/settings.h"
#include <stdio.h>
#endif
#include "wx/tooltip.h"
#endif
+#if wxUSE_NOTEBOOK
+ #include "wx/notebook.h"
+#endif
+
#if wxUSE_CARET
#include "wx/caret.h"
#endif // wxUSE_CARET
# define CW_USEDEFAULT ((int)0x80000000)
#endif
+#ifndef VK_OEM_1
+ #define VK_OEM_1 0xBA
+ #define VK_OEM_PLUS 0xBB
+ #define VK_OEM_COMMA 0xBC
+ #define VK_OEM_MINUS 0xBD
+ #define VK_OEM_PERIOD 0xBE
+ #define VK_OEM_2 0xBF
+ #define VK_OEM_3 0xC0
+ #define VK_OEM_4 0xDB
+ #define VK_OEM_5 0xDC
+ #define VK_OEM_6 0xDD
+ #define VK_OEM_7 0xDE
+#endif
+
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
//
-// The last Windows message we got (MT-UNSAFE)
+// The last PM message we got (MT-UNSAFE)
//
QMSG s_currentMsg;
+#if wxUSE_MENUS_NATIVE
wxMenu* wxCurrentPopupMenu = NULL;
-extern wxList WXDLLEXPORT wxPendingDelete;
-#if !defined(__VISAGECPP__) || (__IBMCPP__ < 400)
-extern wxChar wxCanvasClassName[];
-#endif
-wxList* wxWinHandleList = NULL;
+#endif // wxUSE_MENUS_NATIVE
// ---------------------------------------------------------------------------
// private functions
const char *wxGetMessageName(int message);
#endif //__WXDEBUG__
-void wxRemoveHandleAssociation(wxWindow* pWin);
-void wxAssociateWinWithHandle( HWND hWnd
- ,wxWindow* pWin
- );
-wxWindow* wxFindWinFromHandle(WXHWND hWnd);
-
-//
-// This magical function is used to translate VK_APPS key presses to right
-// mouse clicks
-//
-static void TranslateKbdEventToMouse( wxWindow* pWin
- ,int* pX
- ,int* pY
- ,MPARAM* pFlags
+wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin
+ ,short* pnX
+ ,short* pnY
);
+void wxRemoveHandleAssociation(wxWindowOS2* pWin);
+void wxAssociateWinWithHandle( HWND hWnd
+ ,wxWindowOS2* pWin
+ );
+wxWindow* wxFindWinFromHandle(WXHWND hWnd);
//
// get the current state of SHIFT/CTRL keys
//
static inline bool IsShiftDown() { return (::WinGetKeyState(HWND_DESKTOP, VK_SHIFT) & 0x8000) != 0; }
static inline bool IsCtrlDown() { return (::WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x8000) != 0; }
+
+static wxWindow* gpWinBeingCreated = NULL;
+
// ---------------------------------------------------------------------------
// event tables
// ---------------------------------------------------------------------------
+// in wxUniv-OS/2 this class is abstract because it doesn't have DoPopupMenu()
+// method
+#ifdef __WXUNIVERSAL__
+ IMPLEMENT_ABSTRACT_CLASS(wxWindowOS2, wxWindowBase)
+#else // __WXPM__
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXPM__
-BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
+BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase)
EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground)
EVT_SYS_COLOUR_CHANGED(wxWindowOS2::OnSysColourChanged)
- EVT_INIT_DIALOG(wxWindowOS2::OnInitDialog)
EVT_IDLE(wxWindowOS2::OnIdle)
EVT_SET_FOCUS(wxWindowOS2::OnSetFocus)
END_EVENT_TABLE()
// implementation
// ===========================================================================
+// ---------------------------------------------------------------------------
+// wxWindow utility functions
+// ---------------------------------------------------------------------------
+
//
// Find an item given the PM Window id
//
long lId
) const
{
- wxControl* pItem = wxDynamicCast( this
- ,wxControl
- );
+#if wxUSE_CONTROLS
+ wxControl* pItem = wxDynamicCast(this, wxControl);
if (pItem)
{
//
// I it we or one of our "internal" children?
//
- if (pItem->GetId() == lId ||
- (pItem->GetSubcontrols().Index(lId) != wxNOT_FOUND))
+ if (pItem->GetId() == lId
+#ifndef __WXUNIVERSAL__
+ || (pItem->GetSubcontrols().Index(lId) != wxNOT_FOUND)
+#endif
+ )
{
return pItem;
}
}
+#endif // wxUSE_CONTROLS
- wxWindowList::Node* pCurrent = GetChildren().GetFirst();
+ wxWindowList::compatibility_iterator current = GetChildren().GetFirst();
- while (pCurrent)
+ while (current)
{
- wxWindow* pChildWin = pCurrent->GetData();
+ wxWindow* pChildWin = current->GetData();
wxWindow* pWnd = pChildWin->FindItem(lId);
if (pWnd)
return pWnd;
- pCurrent = pCurrent->GetNext();
+ current = current->GetNext();
}
return(NULL);
} // end of wxWindowOS2::FindItem
, bool bControlOnly
) const
{
- wxWindowList::Node* pCurrent = GetChildren().GetFirst();
+ wxWindowList::compatibility_iterator current = GetChildren().GetFirst();
- while (pCurrent)
+ while (current)
{
- wxWindow* pParent = pCurrent->GetData();
+ wxWindow* pParent = current->GetData();
//
// Do a recursive search.
if (pWnd)
return(pWnd);
- if (!bControlOnly || pParent->IsKindOf(CLASSINFO(wxControl)))
+ if (!bControlOnly
+#if wxUSE_CONTROLS
+ || pParent->IsKindOf(CLASSINFO(wxControl))
+#endif // wxUSE_CONTROLS
+ )
{
- wxWindow* pItem = pCurrent->GetData();
+ wxWindow* pItem = current->GetData();
if (pItem->GetHWND() == hWnd)
return(pItem);
return(pItem);
}
}
- pCurrent = pCurrent->GetNext();
+ current = current->GetNext();
}
return(NULL);
} // end of wxWindowOS2::FindItemByHWND
void wxWindowOS2::Init()
{
- //
- // Generic
- //
- InitBase();
-
//
// PM specific
//
- m_bDoubleClickAllowed = 0;
m_bWinCaptured = FALSE;
- m_isBeingDeleted = FALSE;
- m_fnOldWndProc = 0;
- m_bUseCtl3D = FALSE;
- m_bMouseInWindow = FALSE;
+ m_fnOldWndProc = NULL;
+ m_bUseCtl3D = FALSE;
+ m_bMouseInWindow = FALSE;
+ m_bLastKeydownProcessed = FALSE;
+ m_pChildrenDisabled = NULL;
//
// wxWnd
m_hWndScrollBarHorz = 0L;
m_hWndScrollBarVert = 0L;
+ memset(&m_vWinSwp, '\0', sizeof (SWP));
+
//
// Pass WM_GETDLGCODE to DefWindowProc()
+ //
m_lDlgCode = 0;
m_nXThumbSize = 0;
{
m_isBeingDeleted = TRUE;
- OS2DetachWindowMenu();
for (wxWindow* pWin = GetParent(); pWin; pWin = pWin->GetParent())
{
- wxFrame* pFrame = wxDynamicCast(pWin, wxFrame);
+ wxTopLevelWindow* pFrame = wxDynamicCast(pWin, wxTopLevelWindow);
if (pFrame)
{
if (pFrame->GetLastFocus() == this)
- pFrame->SetLastFocus((wxWindow*)NULL);
+ pFrame->SetLastFocus(NULL);
}
}
- if (m_parent)
- m_parent->RemoveChild(this);
+
DestroyChildren();
if (m_hWnd)
//
wxRemoveHandleAssociation(this);
}
+ delete m_pChildrenDisabled;
} // end of wxWindowOS2::~wxWindowOS2
+// real construction (Init() must have been called before!)
bool wxWindowOS2::Create(
wxWindow* pParent
, wxWindowID vId
)
{
HWND hParent = NULLHANDLE;
- wxPoint vPos = rPos; // The OS/2 position
- ULONG ulCreateFlags = 0L;
+ ULONG ulCreateFlags = 0;
+ WXDWORD dwExStyle = 0;
wxCHECK_MSG(pParent, FALSE, wxT("can't create wxWindow without parent"));
+#if wxUSE_STATBOX
+ //
+ // wxGTK doesn't allow to create controls with static box as the parent so
+ // this will result in a crash when the program is ported to wxGTK - warn
+ // about it
+ //
+ // the correct solution is to create the controls as siblings of the
+ // static box
+ //
+ wxASSERT_MSG( !wxDynamicCast(pParent, wxStaticBox),
+ _T("wxStaticBox can't be used as a window parent!") );
+#endif // wxUSE_STATBOX
+
+ // Ensure groupbox backgrounds are painted
+ if (IsKindOf(CLASSINFO(wxPanel)))
+ lStyle &= ~wxCLIP_CHILDREN;
+
if ( !CreateBase( pParent
,vId
,rPos
if (pParent)
{
- int nTempy;
-
pParent->AddChild(this);
hParent = GetWinHwnd(pParent);
- //
- // OS2 uses normal coordinates, no bassackwards Windows ones
- //
- if (pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)) ||
- pParent->IsKindOf(CLASSINFO(wxScrolledWindow))
- )
- {
- wxWindow* pGrandParent = NULL;
- pGrandParent = pParent->GetParent();
- if (pGrandParent)
- nTempy = pGrandParent->GetSize().y - (vPos.y + rSize.y);
- else
- nTempy = pParent->GetSize().y - (vPos.y + rSize.y);
- }
- else
- nTempy = pParent->GetSize().y - (vPos.y + rSize.y);
- vPos.y = nTempy;
if ( pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)) ||
pParent->IsKindOf(CLASSINFO(wxScrolledWindow))
)
ulCreateFlags |= WS_CLIPSIBLINGS;
}
- else
- {
- RECTL vRect;
-
- ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
- hParent = HWND_DESKTOP;
- vPos.y = vRect.yTop - (vPos.y + rSize.y);
- }
//
// Most wxSTYLES are really PM Class specific styles and will be
// set in those class create procs. PM's basic windows styles are
// very limited.
//
- ulCreateFlags |= WS_VISIBLE;
-
-
- if (lStyle & wxCLIP_SIBLINGS)
- ulCreateFlags |= WS_CLIPSIBLINGS;
+ ulCreateFlags |= OS2GetCreateWindowFlags(&dwExStyle);
- if (lStyle & wxCLIP_CHILDREN )
- ulCreateFlags |= WS_CLIPCHILDREN;
-
- //
- //
- //
- bool bWant3D;
- WXDWORD dwExStyle = Determine3DEffects( WS_EX_CLIENTEDGE
- ,&bWant3D
- );
- //
- // Add the simple border style as we'll use this to draw borders
- //
- if (lStyle & wxSIMPLE_BORDER)
- dwExStyle |= wxSIMPLE_BORDER;
+#ifdef __WXUNIVERSAL__
+ // no 3d effects, we draw them ourselves
+ WXDWORD exStyle = 0;
+#endif // !wxUniversal
+ if (lStyle & wxPOPUP_WINDOW)
+ {
+ ulCreateFlags &= ~WS_VISIBLE;
+ m_isShown = FALSE;
+ }
+ else
+ {
+ ulCreateFlags |= WS_VISIBLE;
+ }
//
- // Generic OS/2 Windows are created with no owner, no Z Order, no Control data,
- // and no presentation parameters
+ // Generic OS/2 Windows have no Control Data but other classes
+ // that call OS2Create may have some.
//
- OS2Create( hParent
- ,(PSZ)wxCanvasClassName
- ,rName.c_str()
- ,ulCreateFlags
- ,vPos.x
- ,vPos.y
- ,WidthDefault(rSize.x)
- ,HeightDefault(rSize.y)
- ,NULLHANDLE
- ,NULLHANDLE
- ,m_windowId
- ,NULL
- ,NULL
- ,dwExStyle
- );
-
- return(TRUE);
+ return(OS2Create( (PSZ)wxCanvasClassName
+ ,rName.c_str()
+ ,ulCreateFlags
+ ,rPos
+ ,rSize
+ ,NULL // Control Data
+ ,dwExStyle
+ ,TRUE // Child
+ ));
} // end of wxWindowOS2::Create
// ---------------------------------------------------------------------------
void wxWindowOS2::SetFocus()
{
HWND hWnd = GetHwnd();
+ wxCHECK_RET( hWnd, _T("can't set focus to invalid window") );
if (hWnd)
::WinSetFocus(HWND_DESKTOP, hWnd);
} // end of wxWindowOS2::SetFocus
-wxWindow* wxWindowBase::FindFocus()
+void wxWindowOS2::SetFocusFromKbd()
+{
+ //
+ // Nothing else to do under OS/2
+ //
+ wxWindowBase::SetFocusFromKbd();
+} // end of wxWindowOS2::SetFocus
+
+wxWindow* wxWindowBase::DoFindFocus()
{
HWND hWnd = ::WinQueryFocus(HWND_DESKTOP);
return wxFindWinFromHandle((WXHWND)hWnd);
}
return NULL;
-} // wxWindowBase::FindFocus
+} // wxWindowBase::DoFindFocus
bool wxWindowOS2::Enable(
bool bEnable
if ( hWnd )
::WinEnableWindow(hWnd, (BOOL)bEnable);
- wxWindowList::Node* pNode = GetChildren().GetFirst();
+ //
+ // The logic below doesn't apply to the top level windows -- otherwise
+ // showing a modal dialog would result in total greying out (and ungreying
+ // out later) of everything which would be really ugly
+ //
+ if (IsTopLevel())
+ return TRUE;
+
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- while (pNode)
+ while (node)
{
- wxWindow* pChild = pNode->GetData();
+ wxWindow* pChild = node->GetData();
- pChild->Enable(bEnable);
- pNode = pNode->GetNext();
+ if (bEnable)
+ {
+ //
+ // Enable the child back unless it had been disabled before us
+ //
+ if (!m_pChildrenDisabled || !m_pChildrenDisabled->Find(pChild))
+ pChild->Enable();
+ }
+ else // we're being disabled
+ {
+ if (pChild->IsEnabled())
+ {
+ //
+ // Disable it as children shouldn't stay enabled while the
+ // parent is not
+ //
+ pChild->Disable();
+ }
+ else // child already disabled, remember it
+ {
+ //
+ // Have we created the list of disabled children already?
+ //
+ if (!m_pChildrenDisabled)
+ m_pChildrenDisabled = new wxWindowList;
+ m_pChildrenDisabled->Append(pChild);
+ }
+ }
+ node = node->GetNext();
}
- return(TRUE);
+ if (bEnable && m_pChildrenDisabled)
+ {
+ //
+ // We don't need this list any more, don't keep unused memory
+ //
+ delete m_pChildrenDisabled;
+ m_pChildrenDisabled = NULL;
+ }
+ return TRUE;
} // end of wxWindowOS2::Enable
bool wxWindowOS2::Show(
{
::WinSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE | SWP_ZORDER);
}
- return(TRUE);
+ return TRUE;
} // end of wxWindowOS2::Show
void wxWindowOS2::Raise()
const wxString& rTitle
)
{
- ::WinSetWindowText(GetHwnd(), rTitle.c_str());
+ ::WinSetWindowText(GetHwnd(), (PSZ)rTitle.c_str());
} // end of wxWindowOS2::SetTitle
wxString wxWindowOS2::GetTitle() const
return wxGetWindowText(GetHWND());
} // end of wxWindowOS2::GetTitle
-void wxWindowOS2::CaptureMouse()
+void wxWindowOS2::DoCaptureMouse()
{
HWND hWnd = GetHwnd();
}
} // end of wxWindowOS2::GetTitle
-void wxWindowOS2::ReleaseMouse()
+void wxWindowOS2::DoReleaseMouse()
{
if (m_bWinCaptured)
{
HWND hWnd = GetHwnd();
- if (hWnd != 0)
- {
- wxChar zFont[128];
-
- sprintf(zFont, "%d.%s", rFont.GetPointSize(), rFont.GetFaceName().c_str());
- return(::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont), (PVOID)zFont));
- }
+ wxOS2SetFont( hWnd
+ ,rFont
+ );
return(TRUE);
-}
+} // end of wxWindowOS2::SetFont
bool wxWindowOS2::SetCursor(
const wxCursor& rCursor
return FALSE;
}
- wxASSERT_MSG( m_cursor.Ok(),
- wxT("cursor must be valid after call to the base version"));
-
- HWND hWnd = GetHwnd();
- POINTL vPoint;
- RECTL vRect;
- HPS hPS;
- HRGN hRGN;
-
- hPS = ::WinGetPS(hWnd);
-
- ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
- ::WinQueryWindowRect(hWnd, &vRect);
+ if ( m_cursor.Ok() ) {
+ HWND hWnd = GetHwnd();
+ POINTL vPoint;
+ RECTL vRect;
- hRGN = ::GpiCreateRegion(hPS, 1L, &vRect);
+ ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+ ::WinQueryWindowRect(hWnd, &vRect);
- if ((::GpiPtInRegion(hPS, hRGN, &vPoint) == PRGN_INSIDE) && !wxIsBusy())
- {
- ::WinSetPointer(HWND_DESKTOP, (HPOINTER)m_cursor.GetHCURSOR());
+ if (::WinPtInRect(vHabmain, &vRect, &vPoint) && !wxIsBusy())
+ {
+ ::WinSetPointer(HWND_DESKTOP, (HPOINTER)m_cursor.GetHCURSOR());
+ }
}
return TRUE;
} // end of wxWindowOS2::SetCursor
::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY));
} // end of wxWindowOS2::WarpPointer
-#if WXWIN_COMPATIBILITY
-void wxWindowOS2::OS2DeviceToLogical (float *x, float *y) const
-{
-}
-#endif // WXWIN_COMPATIBILITY
// ---------------------------------------------------------------------------
// scrolling stuff
// ---------------------------------------------------------------------------
-#if WXWIN_COMPATIBILITY
-void wxWindowOS2::SetScrollRange(
- int nOrient
-, int nRange
-, bool bRefresh
-)
-{
- int nRange1 = nRange;
- int nPageSize = GetScrollPage(nOrient);
-
- if (nPpageSize > 1 && nRange > 0)
- {
- nRange1 += (nPageSize - 1);
- }
-
- if (nOrient == wxHORIZONTAL)
- {
- ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
- ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
- }
- else
- {
- ::WinSendMsg(m_hWndScrollBarVert, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
- ::WinSendMsg(m_hWndScrollBarVert, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
- }
-} // end of wxWindowOS2::SetScrollRange
-
-void wxWindowOS2::SetScrollPage(
- int nOrient
-, int nPage
-, bool bRefresh
-)
-{
- if (nOrient == wxHORIZONTAL )
- m_nXThumbSize = nPage;
- else
- m_nYThumbSize = nPage;
-} // end of wxWindowOS2::SetScrollPage
-
-int wxWindowOS2::OldGetScrollRange(
- int nOrient
-) const
-{
- MRESULT mRc;
- HWND hWnd = GetHwnd();
-
- if (hWnd)
- {
- mRc = WinSendMsg(hWnd, SBM_QUERYRANGE, (MPARAM)0L, (MPARAM)0L);
- return(SHORT2FROMMR(mRc));
- }
- return 0;
-} // end of wxWindowOS2::OldGetScrollRange
-
-int wxWindowOS2::GetScrollPage(
- int nOrient
-) const
-{
- if (nOrient == wxHORIZONTAL)
- return m_nXThumbSize;
- else
- return m_nYThumbSize;
-} // end of wxWindowOS2::GetScrollPage
-#endif // WXWIN_COMPATIBILITY
-
int wxWindowOS2::GetScrollPos(
int nOrient
) const
void wxWindowOS2::SetScrollPos(
int nOrient
, int nPos
-, bool bRefresh
+, bool WXUNUSED(bRefresh)
)
{
if (nOrient == wxHORIZONTAL )
::WinSendMsg(m_hWndScrollBarHorz, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL);
else
::WinSendMsg(m_hWndScrollBarVert, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL);
-} // end of wxWindowOS2::SetScrollPos(
+} // end of wxWindowOS2::SetScrollPos
void wxWindowOS2::SetScrollbar(
int nOrient
, int nPos
, int nThumbVisible
, int nRange
-, bool bRefresh
+, bool WXUNUSED(bRefresh)
)
{
+ HWND hWnd = GetHwnd();
int nOldRange = nRange - nThumbVisible;
int nRange1 = nOldRange;
int nPageSize = nThumbVisible;
+
SBCDATA vInfo;
- HWND hWnd = GetHwnd();
ULONG ulStyle = WS_VISIBLE | WS_SYNCPAINT;
- RECTL vRect;
+ SWP vSwp;
+ SWP vSwpOwner;
+ HWND hWndParent;
+ HWND hWndClient;
+ wxWindow* pParent = GetParent();
+
+ if (pParent && pParent->IsKindOf(CLASSINFO(wxFrame)))
+ {
+ wxFrame* pFrame;
+
+ pFrame = wxDynamicCast(pParent, wxFrame);
+ hWndParent = pFrame->GetFrame();
+ hWndClient = GetHwndOf(pParent);
+ }
+ else
+ {
+ if (pParent)
+ hWndParent = GetHwndOf(pParent);
+ else
+ hWndParent = GetHwnd();
+ hWndClient = hWndParent;
+ }
+ ::WinQueryWindowPos(hWndClient, &vSwp);
+ ::WinQueryWindowPos(hWnd, &vSwpOwner);
- ::WinQueryWindowRect(hWnd, &vRect);
if (nPageSize > 1 && nRange > 0)
{
nRange1 += (nPageSize - 1);
if (m_hWndScrollBarHorz == 0L)
{
//
- // We create the scrollbars with the desktop so that they are not
- // registered as child windows of the window in order that child
- // windows may be scrolled without scrolling the scrollbars themselves!
+ // Since the scrollbars are usually created before the owner is
+ // sized either via an OnSize event directly or via sizers or
+ // layout constraints, we will initially just use the coords of
+ // the parent window (this is usually a frame client window). But
+ // the bars themselves, are children of the parent frame (i.e
+ // siblings of the frame client. The owner, however is the actual
+ // window being scrolled (or at least the one responsible for
+ // handling the scroll events). The owner will be resized later,
+ // as it is usually a child of a top level window, and when that
+ // is done its scrollbars will be resized and repositioned as well.
//
- m_hWndScrollBarHorz = ::WinCreateWindow( hWnd
+ m_hWndScrollBarHorz = ::WinCreateWindow( hWndParent
,WC_SCROLLBAR
,(PSZ)NULL
,ulStyle
- ,vRect.xLeft
- ,vRect.yBottom
- ,vRect.xRight - vRect.xLeft
+ ,vSwp.x
+ ,vSwp.y
+ ,vSwp.cx - 20
,20
,hWnd
,HWND_TOP
- ,FID_HORZSCROLL
+ ,60000
,&vInfo
,NULL
);
}
else
{
- RECTL vRect2;
-
//
- // Only want to resize the scrollbar if it changes, otherwise
- // we'd probably end up in a recursive loop until we crash the call stack
- // because this method is called in a ScrolledWindow OnSize event and SWP_MOVE | SWP_SIZE
- // generates those events.
+ // The owner (the scrolled window) is a child of the Frame's
+ // client window, usually. The scrollbars are children of the
+ // frame, itself, and thus are positioned relative to the frame's
+ // origin, not the frame's client window origin.
+ // The starting x position is the same as the starting x position
+ // of the owner, but in terms of the parent frame.
+ // The starting y position is 20 pels below the origin of the
+ // owner in terms of the parent frame.
+ // The horz bar is the same width as the owner and 20 pels high.
//
- ::WinQueryWindowRect(m_hWndScrollBarHorz, &vRect2);
- if (!(vRect2.xLeft == vRect.xLeft &&
- vRect2.xRight == vRect.xRight &&
- vRect2.yBottom == vRect.yBottom &&
- vRect2.yTop == vRect.yTop
- ) )
+ if (nRange1 >= nThumbVisible)
{
::WinSetWindowPos( m_hWndScrollBarHorz
,HWND_TOP
- ,vRect.xLeft
- ,vRect.yBottom
- ,vRect.xRight - vRect.xLeft
+ ,vSwp.x + vSwpOwner.x
+ ,(vSwp.y + vSwpOwner.y) - 20
+ ,vSwpOwner.cx
,20
- ,SWP_ACTIVATE | SWP_MOVE | SWP_SIZE | SWP_SHOW
+ ,SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER
);
+ ::WinSendMsg( m_hWndScrollBarHorz
+ ,SBM_SETSCROLLBAR
+ ,(MPARAM)nPos
+ ,MPFROM2SHORT(0, (SHORT)nRange1)
+ );
+ ::WinSendMsg( m_hWndScrollBarHorz
+ ,SBM_SETTHUMBSIZE
+ ,MPFROM2SHORT( (SHORT)nThumbVisible
+ ,(SHORT)nRange1
+ )
+ ,(MPARAM)0
+ );
}
- ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETSCROLLBAR, (MPARAM)nPos, MPFROM2SHORT(0, (SHORT)nRange1));
- ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
+ else
+ ::WinShowWindow(m_hWndScrollBarHorz, FALSE);
}
}
else
ulStyle |= SBS_VERT;
if (m_hWndScrollBarVert == 0L)
{
- m_hWndScrollBarVert = ::WinCreateWindow( hWnd
+ //
+ // Since the scrollbars are usually created before the owner is
+ // sized either via an OnSize event directly or via sizers or
+ // layout constraints, we will initially just use the coords of
+ // the parent window (this is usually a frame client window). But
+ // the bars themselves, are children of the parent frame (i.e
+ // siblings of the frame client. The owner, however is the actual
+ // window being scrolled (or at least the one responsible for
+ // handling the scroll events). The owner will be resized later,
+ // as it is usually a child of a top level window, and when that
+ // is done its scrollbars will be resized and repositioned as well.
+ //
+ m_hWndScrollBarVert = ::WinCreateWindow( hWndParent
,WC_SCROLLBAR
,(PSZ)NULL
,ulStyle
- ,vRect.xRight - 20
- ,vRect.yBottom + 20
+ ,vSwp.x + vSwp.cx - 20
+ ,vSwp.y + 20
,20
- ,vRect.yTop - (vRect.yBottom + 20)
+ ,vSwp.cy - 20
,hWnd
,HWND_TOP
- ,FID_VERTSCROLL
+ ,60001
,&vInfo
,NULL
);
}
else
{
- RECTL vRect2;
-
//
- // Only want to resize the scrollbar if it changes, otherwise
- // we'd probably end up in a recursive loop until we crash the call stack
- // because this method is called in a ScrolledWindow OnSize event and SWP_MOVE | SWP_SIZE
- // generates those events.
+ // The owner (the scrolled window) is a child of the Frame's
+ // client window, usually. The scrollbars are children of the
+ // frame, itself and thus are positioned relative to the frame's
+ // origin, not the frame's client window's origin.
+ // Thus, the x position will be frame client's x (usually a few
+ // pels inside the parent frame, plus the width of the owner.
+ // Since we may be using sizers or layout constraints for multiple
+ // child scrolled windows, the y position will be the frame client's
+ // y pos plus the scrolled windows y position, yielding the y
+ // position of the scrollbar relative to the parent frame (the vert
+ // scrollbar is on the right and starts at the bottom of the
+ // owner window).
+ // It is 20 pels wide and the same height as the owner.
//
- ::WinQueryWindowRect(m_hWndScrollBarVert, &vRect2);
- if (!(vRect2.xLeft == vRect.xLeft &&
- vRect2.xRight == vRect.xRight &&
- vRect2.yBottom == vRect.yBottom &&
- vRect2.yTop == vRect.yTop
- ) )
+ if (nRange1 >= nThumbVisible)
{
::WinSetWindowPos( m_hWndScrollBarVert
,HWND_TOP
- ,vRect.xRight - 20
- ,vRect.yBottom + 20
+ ,vSwp.x + vSwpOwner.x + vSwpOwner.cx
+ ,vSwp.y + vSwpOwner.y
,20
- ,vRect.yTop - (vRect.yBottom + 20)
+ ,vSwpOwner.cy
,SWP_ACTIVATE | SWP_MOVE | SWP_SIZE | SWP_SHOW
);
+ ::WinSendMsg( m_hWndScrollBarVert
+ ,SBM_SETSCROLLBAR
+ ,(MPARAM)nPos
+ ,MPFROM2SHORT(0, (SHORT)nRange1)
+ );
+ ::WinSendMsg( m_hWndScrollBarVert
+ ,SBM_SETTHUMBSIZE
+ ,MPFROM2SHORT( (SHORT)nThumbVisible
+ ,(SHORT)nRange1
+ )
+ ,(MPARAM)0
+ );
}
- ::WinSendMsg(m_hWndScrollBarVert, SBM_SETSCROLLBAR, (MPARAM)nPos, MPFROM2SHORT(0, (SHORT)nRange1));
- ::WinSendMsg(m_hWndScrollBarVert, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
+ else
+ ::WinShowWindow(m_hWndScrollBarVert, FALSE);
}
m_nYThumbSize = nThumbVisible;
}
)
{
RECTL vRect;
- RECTL vRect2;
-
- nDy *= -1; // flip the sign of Dy as OS/2 is opposite wxWin.
- if (pRect)
- {
- vRect2.xLeft = pRect->x;
- vRect2.yTop = pRect->y + pRect->height;
- vRect2.xRight = pRect->x + pRect->width;
- vRect2.yBottom = pRect->y;
- }
- else
- {
- ::WinQueryWindowRect(GetHwnd(), &vRect2);
- ::WinQueryWindowRect(m_hWndScrollBarHorz, &vRect);
- vRect2.yBottom += vRect.yTop - vRect.yBottom;
- ::WinQueryWindowRect(m_hWndScrollBarVert, &vRect);
- vRect2.xRight -= vRect.xRight - vRect.xLeft;
- }
+ ::WinQueryWindowRect(GetHwnd(), &vRect);
+ int height = vRect.yTop;
if (pRect)
- ::WinScrollWindow( GetHwnd()
- ,(LONG)nDx
- ,(LONG)nDy
- ,&vRect2
- ,NULL
- ,NULLHANDLE
- ,NULL
- ,SW_INVALIDATERGN
- );
- else
- ::WinScrollWindow( GetHwnd()
- ,nDx
- ,nDy
- ,NULL
- ,NULL
- ,NULLHANDLE
- ,NULL
- ,SW_INVALIDATERGN
- );
-
- //
- // Move the children
- wxWindowList::Node* pCurrent = GetChildren().GetFirst();
- SWP vSwp;
-
- while (pCurrent)
{
- wxWindow* pChildWin = pCurrent->GetData();
-
- if (pChildWin->GetHWND() != NULLHANDLE)
- {
- ::WinQueryWindowPos(pChildWin->GetHWND(), &vSwp);
- ::WinQueryWindowRect(pChildWin->GetHWND(), &vRect);
- if (pChildWin->GetHWND() == m_hWndScrollBarVert ||
- pChildWin->GetHWND() == m_hWndScrollBarHorz)
- {
- ::WinSetWindowPos( pChildWin->GetHWND()
- ,HWND_TOP
- ,vSwp.x + nDx
- ,vSwp.y + nDy
- ,0
- ,0
- ,SWP_MOVE | SWP_SHOW | SWP_ZORDER
- );
- }
- else
- {
- ::WinSetWindowPos( pChildWin->GetHWND()
- ,HWND_BOTTOM
- ,vSwp.x + nDx
- ,vSwp.y + nDy
- ,0
- ,0
- ,SWP_MOVE | SWP_ZORDER
- );
- ::WinInvalidateRect(pChildWin->GetHWND(), &vRect, FALSE);
- }
- }
- pCurrent = pCurrent->GetNext();
+ vRect.xLeft = pRect->x;
+ vRect.yTop = height - pRect->y;
+ vRect.xRight = pRect->x + pRect->width;
+ vRect.yBottom = vRect.yTop - pRect->height;
}
+ nDy *= -1; // flip the sign of Dy as OS/2 is opposite Windows.
+ ::WinScrollWindow( GetHwnd()
+ ,(LONG)nDx
+ ,(LONG)nDy
+ ,&vRect
+ ,&vRect
+ ,NULL
+ ,NULL
+ ,SW_SCROLLCHILDREN | SW_INVALIDATERGN
+ );
} // end of wxWindowOS2::ScrollWindow
// ---------------------------------------------------------------------------
{
HWND hwnd = (HWND)hWnd;
- wxASSERT_MSG( !m_fnOldWndProc, wxT("subclassing window twice?") );
wxCHECK_RET(::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in SubclassWin") );
- m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc);
+ wxAssociateWinWithHandle( hWnd
+ ,(wxWindow*)this
+ );
+ if (!wxCheckWindowWndProc( hWnd
+ ,(WXFARPROC)wxWndProc
+ ))
+ {
+ m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc);
+ }
+ else
+ {
+ m_fnOldWndProc = (WXFARPROC)NULL;
+ }
} // end of wxWindowOS2::SubclassWin
void wxWindowOS2::UnsubclassWin()
}
} // end of wxWindowOS2::UnsubclassWin
+bool wxCheckWindowWndProc(
+ WXHWND hWnd
+, WXFARPROC fnWndProc
+)
+{
+ static char zBuffer[512];
+ CLASSINFO vCls;
+
+ ::WinQueryClassName((HWND)hWnd, (LONG)512, (PCH)zBuffer);
+ ::WinQueryClassInfo(wxGetInstance(), (PSZ)zBuffer, &vCls);
+ return(fnWndProc == (WXFARPROC)vCls.pfnWindowProc);
+} // end of WinGuiBase_CheckWindowWndProc
+
+void wxWindowOS2::SetWindowStyleFlag(
+ long lFlags
+)
+{
+ long lFlagsOld = GetWindowStyleFlag();
+
+ if (lFlags == lFlagsOld)
+ return;
+
+ //
+ // Update the internal variable
+ //
+ wxWindowBase::SetWindowStyleFlag(lFlags);
+
+ //
+ // Now update the Windows style as well if needed - and if the window had
+ // been already created
+ //
+ if (!GetHwnd())
+ return;
+
+ WXDWORD dwExstyle;
+ WXDWORD dwExstyleOld;
+ long lStyle = OS2GetStyle( lFlags
+ ,&dwExstyle
+ );
+ long lStyleOld = OS2GetStyle( lFlagsOld
+ ,&dwExstyleOld
+ );
+
+ if (lStyle != lStyleOld)
+ {
+ //
+ // Some flags (e.g. WS_VISIBLE or WS_DISABLED) should not be changed by
+ // this function so instead of simply setting the style to the new
+ // value we clear the bits which were set in styleOld but are set in
+ // the new one and set the ones which were not set before
+ //
+ long lStyleReal = ::WinQueryWindowULong(GetHwnd(), QWL_STYLE);
+
+ lStyleReal &= ~lStyleOld;
+ lStyleReal |= lStyle;
+
+ ::WinSetWindowULong(GetHwnd(), QWL_STYLE, lStyleReal);
+ }
+} // end of wxWindowOS2::SetWindowStyleFlag
+
+WXDWORD wxWindowOS2::OS2GetStyle(
+ long lFlags
+, WXDWORD* pdwExstyle
+) const
+{
+ WXDWORD dwStyle = 0L;
+
+ if (lFlags & wxCLIP_CHILDREN )
+ dwStyle |= WS_CLIPCHILDREN;
+
+ if (lFlags & wxCLIP_SIBLINGS )
+ dwStyle |= WS_CLIPSIBLINGS;
+
+ return dwStyle;
+} // end of wxWindowMSW::MSWGetStyle
+
//
-// Make a Windows extended style from the given wxWindows window style
+// Make a Windows extended style from the given wxWidgets window style
//
WXDWORD wxWindowOS2::MakeExtendedStyle(
long lStyle
} // end of wxWindowOS2::MakeExtendedStyle
//
-// Determines whether simulated 3D effects or CTL3D should be used,
-// applying a default border style if required, and returning an extended
-// style to pass to OS2Create.
+// Setup background and foreground colours correctly
//
-WXDWORD wxWindowOS2::Determine3DEffects(
- WXDWORD dwDefaultBorderStyle
-, bool* pbWant3D
-) const
+void wxWindowOS2::SetupColours()
{
- WXDWORD dwStyle = 0L;
+ if ( GetParent() )
+ SetBackgroundColour(GetParent()->GetBackgroundColour());
+} // end of wxWindowOS2::SetupColours
+void wxWindowOS2::OnIdle(
+ wxIdleEvent& WXUNUSED(rEvent)
+)
+{
//
- // Native PM does not have any specialize 3D effects like WIN32 does,
- // so we have to try and invent them.
+ // Check if we need to send a LEAVE event
//
-
- //
- // If matches certain criteria, then assume no 3D effects
- // unless specifically requested (dealt with in MakeExtendedStyle)
- //
- if (!GetParent() ||
- !IsKindOf(CLASSINFO(wxControl)) ||
- (m_windowStyle & wxNO_BORDER)
- )
- {
- *pbWant3D = FALSE;
- return MakeExtendedStyle(m_windowStyle, FALSE);
- }
-
- //
- // 1) App can specify global 3D effects
- //
- *pbWant3D = wxTheApp->GetAuto3D();
-
- //
- // 2) If the parent is being drawn with user colours, or simple border
- // specified, switch effects off.
- //
- if (GetParent() &&
- (GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) ||
- (m_windowStyle & wxSIMPLE_BORDER)
- )
- *pbWant3D = FALSE;
-
- //
- // 3) Control can override this global setting by defining
- // a border style, e.g. wxSUNKEN_BORDER
- //
- if ((m_windowStyle & wxDOUBLE_BORDER) ||
- (m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSTATIC_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER)
- )
- *pbWant3D = TRUE;
-
- dwStyle = MakeExtendedStyle( m_windowStyle
- ,FALSE
- );
-
- //
- // If we want 3D, but haven't specified a border here,
- // apply the default border style specified.
- //
- if (dwDefaultBorderStyle && (*pbWant3D) &&
- !((m_windowStyle & wxDOUBLE_BORDER) ||
- (m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSTATIC_BORDER) ||
- (m_windowStyle & wxSIMPLE_BORDER)
- )
- )
- dwStyle |= dwDefaultBorderStyle;
- return dwStyle;
-} // end of wxWindowOS2::Determine3DEffects
-
-#if WXWIN_COMPATIBILITY
-void wxWindowOS2::OnCommand(
- wxWindow& rWin
-, wxCommandEvent& rEvent
-)
-{
- if (GetEventHandler()->ProcessEvent(rEvent))
- return;
- if (m_parent)
- m_parent->GetEventHandler()->OnCommand( rWin
- ,rEvent
- );
-} // end of wxWindowOS2::OnCommand
-
-wxObject* wxWindowOS2::GetChild(
- int nNumber
-) const
-{
- //
- // Return a pointer to the Nth object in the Panel
- //
- wxNode* pNode = GetChildren().First();
- int n = nNumber;
-
- while (pNode && n--)
- pNode = pNode->Next();
- if (pNode)
- {
- wxObject* pObj = (wxObject*)pNode->Data();
- return(pObj);
- }
- else
- return NULL;
-} // end of wxWindowOS2::GetChild
-
-#endif // WXWIN_COMPATIBILITY
-
-//
-// Setup background and foreground colours correctly
-//
-void wxWindowOS2::SetupColours()
-{
- if ( GetParent() )
- SetBackgroundColour(GetParent()->GetBackgroundColour());
-} // end of wxWindowOS2::SetupColours
-
-void wxWindowOS2::OnIdle(
- wxIdleEvent& rEvent
-)
-{
- //
- // Check if we need to send a LEAVE event
- //
- if (m_bMouseInWindow)
- {
- POINTL vPoint;
+ if (m_bMouseInWindow)
+ {
+ POINTL vPoint;
::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
if (::WinWindowFromPoint(HWND_DESKTOP, &vPoint, FALSE) != (HWND)GetHwnd())
//
int nState = 0;
- if (::WinGetKeyState(HWND_DESKTOP, VK_SHIFT) != 0)
- nState |= VK_SHIFT;
- if (::WinGetKeyState(HWND_DESKTOP, VK_CTRL) != 0);
- nState |= VK_CTRL;
+ if (IsShiftDown())
+ nState |= KC_SHIFT;
+ if (IsCtrlDown())
+ nState |= KC_CTRL;
wxMouseEvent rEvent(wxEVT_LEAVE_WINDOW);
(void)GetEventHandler()->ProcessEvent(rEvent);
}
}
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate(this))
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
} // end of wxWindowOS2::OnIdle
//
return TRUE;
} // end of wxWindowOS2::Reparent
-void wxWindowOS2::Clear()
+void wxWindowOS2::Update()
{
- wxClientDC vDc(this);
- wxBrush vBrush( GetBackgroundColour()
- ,wxSOLID
- );
+ ::WinUpdateWindow(GetHwnd());
+} // end of wxWindowOS2::Update
+
+void wxWindowOS2::Freeze()
+{
+ ::WinSendMsg(GetHwnd(), WM_VRNDISABLED, (MPARAM)0, (MPARAM)0);
+} // end of wxWindowOS2::Freeze
- vDc.SetBackground(vBrush);
- vDc.Clear();
-} // end of wxWindowOS2::Clear
+void wxWindowOS2::Thaw()
+{
+ ::WinSendMsg(GetHwnd(), WM_VRNENABLED, (MPARAM)TRUE, (MPARAM)0);
+
+ //
+ // We need to refresh everything or otherwise he invalidated area is not
+ // repainted.
+ //
+ Refresh();
+} // end of wxWindowOS2::Thaw
void wxWindowOS2::Refresh(
bool bEraseBack
if (pRect)
{
RECTL vOs2Rect;
+ int height;
+ ::WinQueryWindowRect(GetHwnd(), &vOs2Rect);
+ height = vOs2Rect.yTop;
vOs2Rect.xLeft = pRect->x;
- vOs2Rect.yTop = pRect->y;
+ vOs2Rect.yTop = height - pRect->y;
vOs2Rect.xRight = pRect->x + pRect->width;
- vOs2Rect.yBottom = pRect->y + pRect->height;
+ vOs2Rect.yBottom = vOs2Rect.yTop - pRect->height;
::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack);
}
else
::WinInvalidateRect(hWnd, NULL, bEraseBack);
+ if (m_hWndScrollBarHorz != NULLHANDLE)
+ ::WinInvalidateRect(m_hWndScrollBarHorz, NULL, TRUE);
+ if (m_hWndScrollBarVert != NULLHANDLE)
+ ::WinInvalidateRect(m_hWndScrollBarVert, NULL, TRUE);
}
} // end of wxWindowOS2::Refresh
wxDropTarget* pDropTarget
)
{
- if (m_dropTarget != 0)
- {
- m_dropTarget->Revoke(m_hWnd);
- delete m_dropTarget;
- }
m_dropTarget = pDropTarget;
- if (m_dropTarget != 0)
- m_dropTarget->Register(m_hWnd);
} // end of wxWindowOS2::SetDropTarget
#endif
, int* pHeight
) const
{
- HWND hWnd = GetHwnd();
+ HWND hWnd;
RECTL vRect;
+ if (IsKindOf(CLASSINFO(wxFrame)))
+ {
+ wxFrame* pFrame = wxDynamicCast(this, wxFrame);
+ hWnd = pFrame->GetFrame();
+ }
+ else
+ hWnd = GetHwnd();
+
::WinQueryWindowRect(hWnd, &vRect);
if (pWidth)
) const
{
HWND hWnd = GetHwnd();
- RECT vRect;
+ SWP vSwp;
POINTL vPoint;
+ wxWindow* pParent = GetParent();
- ::WinQueryWindowRect(hWnd, &vRect);
+ //
+ // It would seem that WinQueryWindowRect would be the correlary to
+ // the WIN32 WinGetRect, but unlike WinGetRect which returns the window
+ // origin position in screen coordinates, WinQueryWindowRect returns it
+ // relative to itself, i.e. (0,0). To get the same under PM we must
+ // us WinQueryWindowPos. This call, unlike the WIN32 call, however,
+ // returns a position relative to it's parent, so no parent adujstments
+ // are needed under OS/2. Also, windows should be created using
+ // wxWindow coordinates, i.e 0,0 is the TOP left so vSwp will already
+ // reflect that.
+ //
+ ::WinQueryWindowPos(hWnd, &vSwp);
- vPoint.x = vRect.xLeft;
- vPoint.y = vRect.yBottom;
+ vPoint.x = vSwp.x;
+ vPoint.y = vSwp.y;
//
- // We do the adjustments with respect to the parent only for the "real"
- // children, not for the dialogs/frames
+ // We may be faking the client origin. So a window that's really at (0,
+ // 30) may appear (to wxWin apps) to be at (0, 0).
//
- if (!IsTopLevel())
+ if (pParent)
{
- HWND hParentWnd = 0;
- wxWindow* pParent = GetParent();
-
- if (pParent)
- hParentWnd = GetWinHwnd(pParent);
-
- //
- // Since we now have the absolute screen coords, if there's a parent we
- // must subtract its bottom left corner
- //
- if (hParentWnd)
- {
- RECTL vRect2;
-
- ::WinQueryWindowRect(hParentWnd, &vRect2);
- vPoint.x -= vRect.xLeft;
- vPoint.y -= vRect.yBottom;
- }
-
- //
- // We may be faking the client origin. So a window that's really at (0,
- // 30) may appear (to wxWin apps) to be at (0, 0).
- //
wxPoint vPt(pParent->GetClientAreaOrigin());
vPoint.x -= vPt.x;
::WinQueryWindowPos(hWnd, &vSwp);
if (pX)
- *pX -= vSwp.x;
+ *pX += vSwp.x;
if (pY)
- *pY -= vSwp.y;
+ *pY += vSwp.y;
} // end of wxWindowOS2::DoScreenToClient
void wxWindowOS2::DoClientToScreen(
) const
{
HWND hWnd = GetHwnd();
- HWND hWndClient;
RECTL vRect;
- if (IsKindOf(CLASSINFO(wxFrame)))
- hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
- else
- hWndClient = NULLHANDLE;
- if( hWndClient == NULLHANDLE)
- ::WinQueryWindowRect(GetHwnd(), &vRect);
- else
- ::WinQueryWindowRect(hWndClient, &vRect);
+ ::WinQueryWindowRect(hWnd, &vRect);
+ if (IsKindOf(CLASSINFO(wxDialog)))
+ {
+ RECTL vTitle;
+ HWND hWndTitle;
+ //
+ // For a Dialog we have to explicitly request the client portion.
+ // For a Frame the hWnd IS the client window
+ //
+ hWndTitle = ::WinWindowFromID(hWnd, FID_TITLEBAR);
+ if (::WinQueryWindowRect(hWndTitle, &vTitle))
+ {
+ if (vTitle.yTop - vTitle.yBottom == 0)
+ {
+ //
+ // Dialog has not been created yet, use a default
+ //
+ vTitle.yTop = 20;
+ }
+ vRect.yTop -= (vTitle.yTop - vTitle.yBottom);
+ }
+
+ ULONG uStyle = ::WinQueryWindowULong(hWnd, QWL_STYLE);
+ //
+ // Deal with borders
+ //
+ if (uStyle & FCF_DLGBORDER)
+ {
+ vRect.xLeft += 4;
+ vRect.xRight -= 4;
+ vRect.yTop -= 4;
+ vRect.yBottom += 4;
+ }
+ else if (uStyle & FCF_SIZEBORDER)
+ {
+ vRect.xLeft += 4;
+ vRect.xRight -= 4;
+ vRect.yTop -= 4;
+ vRect.yBottom += 4;
+ }
+ else if (uStyle & FCF_BORDER)
+ {
+ vRect.xLeft += 2;
+ vRect.xRight -= 2;
+ vRect.yTop -= 2;
+ vRect.yBottom += 2;
+ }
+ else // make some kind of adjustment or top sizers ram into the titlebar!
+ {
+ vRect.xLeft += 3;
+ vRect.xRight -= 3;
+ vRect.yTop -= 3;
+ vRect.yBottom += 3;
+ }
+ }
if (pWidth)
- *pWidth = vRect.xRight;
+ *pWidth = vRect.xRight - vRect.xLeft;
if (pHeight)
- *pHeight = vRect.yTop;
+ *pHeight = vRect.yTop - vRect.yBottom;
} // end of wxWindowOS2::DoGetClientSize
void wxWindowOS2::DoMoveWindow(
)
{
RECTL vRect;
- HWND hParent;
wxWindow* pParent = GetParent();
- if (pParent)
- hParent = GetWinHwnd(pParent);
+ /* Due to OS/2's inverted coordinate system, changing the height
+ of a window requires repositioning all it's children, e.g. if
+ you want a child of height 100 to be at the top left corner of
+ the parent you need to position the lower left corner of the
+ child at (0, (height of parent - 100)), so, obviously, if the
+ height of the parent changes, the child needs to be repositioned. */
+ int nHeightDelta;
+ GetSize(0, &nHeightDelta);
+ nHeightDelta = nHeight - nHeightDelta;
+
+ if (pParent && !IsKindOf(CLASSINFO(wxDialog)))
+ {
+ int nOS2Height = GetOS2ParentHeight(pParent);
+
+ nY = nOS2Height - (nY + nHeight);
+ }
+ else
+ {
+ RECTL vRect;
+
+ ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+ nY = vRect.yTop - (nY + nHeight);
+ }
+
+ //
+ // In the case of a frame whose client is sized, the client cannot be
+ // large than its parent frame minus its borders! This usually happens
+ // when using an autosizer to size a frame to precisely hold client
+ // controls as in the notebook sample.
+ //
+ // In this case, we may need to resize both a frame and its client so we
+ // need a quick calc of the frame border size, then if the frame
+ // (less its borders) is smaller than the client, size the frame to
+ // encompass the client with the appropriate border size.
+ //
+ if (IsKindOf(CLASSINFO(wxFrame)))
+ {
+ RECTL vFRect;
+ HWND hWndFrame;
+ int nWidthFrameDelta = 0;
+ int nHeightFrameDelta = 0;
+ int nHeightFrame = 0;
+ int nWidthFrame = 0;
+ wxFrame* pFrame;
+
+ pFrame = wxDynamicCast(this, wxFrame);
+ hWndFrame = pFrame->GetFrame();
+ ::WinQueryWindowRect(hWndFrame, &vRect);
+ ::WinMapWindowPoints(hWndFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2);
+ vFRect = vRect;
+ ::WinCalcFrameRect(hWndFrame, &vRect, TRUE);
+ nWidthFrameDelta = ((vRect.xLeft - vFRect.xLeft) + (vFRect.xRight - vRect.xRight));
+ nHeightFrameDelta = ((vRect.yBottom - vFRect.yBottom) + (vFRect.yTop - vRect.yTop));
+ nWidthFrame = vFRect.xRight - vFRect.xLeft;
+ nHeightFrame = vFRect.yTop - vFRect.yBottom;
+
+ if (nWidth == vFRect.xRight - vFRect.xLeft &&
+ nHeight == vFRect.yTop - vFRect.yBottom)
+ {
+ //
+ // In this case the caller is not aware of OS/2's need to size both
+ // the frame and it's client and is really only moving the window,
+ // not resizeing it. So move the frame, and back off the sizes
+ // for a proper client fit.
+ //
+ ::WinSetWindowPos( hWndFrame
+ ,HWND_TOP
+ ,(LONG)nX - (vRect.xLeft - vFRect.xLeft)
+ ,(LONG)nY - (vRect.yBottom - vFRect.yBottom)
+ ,(LONG)0
+ ,(LONG)0
+ ,SWP_MOVE
+ );
+ nX += (vRect.xLeft - vFRect.xLeft);
+ nY += (vRect.yBottom - vFRect.yBottom);
+ nWidth -= nWidthFrameDelta;
+ nHeight -= nHeightFrameDelta;
+ }
+ else
+ {
+ if (nWidth > nWidthFrame - nHeightFrameDelta ||
+ nHeight > nHeightFrame - nHeightFrameDelta)
+ {
+ ::WinSetWindowPos( hWndFrame
+ ,HWND_TOP
+ ,(LONG)nX - (vRect.xLeft - vFRect.xLeft)
+ ,(LONG)nY - (vRect.yBottom - vFRect.yBottom)
+ ,(LONG)nWidth + nWidthFrameDelta
+ ,(LONG)nHeight + nHeightFrameDelta
+ ,SWP_MOVE | SWP_SIZE
+ );
+ }
+ }
+ }
+
+ ::WinSetWindowPos( GetHwnd()
+ ,HWND_TOP
+ ,(LONG)nX
+ ,(LONG)nY
+ ,(LONG)nWidth
+ ,(LONG)nHeight
+ ,SWP_SIZE | SWP_MOVE
+ );
+ if (m_vWinSwp.cx == 0 && m_vWinSwp.cy == 0 && m_vWinSwp.fl == 0)
+ //
+ // Uninitialized
+ //
+ ::WinQueryWindowPos(GetHwnd(), &m_vWinSwp);
else
- hParent = HWND_DESKTOP;
- ::WinQueryWindowRect(hParent, &vRect);
- nY = vRect.yTop - (nY + nHeight);
-
- if ( !::WinSetWindowPos( GetHwnd()
- ,HWND_TOP
- ,(LONG)nX
- ,(LONG)nY
- ,(LONG)nWidth
- ,(LONG)nHeight
- ,SWP_SIZE | SWP_MOVE
- ))
{
- wxLogLastError("MoveWindow");
+ int nYDiff = m_vWinSwp.cy - nHeight;
+
+ //
+ // Handle resizing of scrolled windows. The target or window to
+ // be scrolled is the owner (gets the scroll notificaitons). The
+ // parent is usually the parent frame of the scrolled panel window.
+ // In order to show the scrollbars the target window will be shrunk
+ // by the size of the scroll bar widths (20) and moved in the X and Y
+ // directon. That value will be computed as part of the diff for
+ // moving the children. Everytime the window is sized the
+ // toplevel OnSize is going to resize the panel to fit the client
+ // or the whole sizer and will need to me resized. This will send
+ // a WM_SIZE out which will be intercepted by the ScrollHelper
+ // which will cause the scrollbars to be displayed via the SetScrollbar
+ // call in CWindow.
+ //
+ if ( IsKindOf(CLASSINFO(wxGenericScrolledWindow)) ||
+ IsKindOf(CLASSINFO(wxScrolledWindow))
+ )
+ {
+ int nAdjustWidth = 0;
+ int nAdjustHeight = 0;
+ SWP vSwpScroll;
+
+ if (GetScrollBarHorz() == NULLHANDLE ||
+ !WinIsWindowShowing(GetScrollBarHorz()))
+ nAdjustHeight = 0L;
+ else
+ nAdjustHeight = 20L;
+ if (GetScrollBarVert() == NULLHANDLE ||
+ !WinIsWindowShowing(GetScrollBarVert()))
+ nAdjustWidth = 0L;
+ else
+ nAdjustWidth = 20L;
+ ::WinQueryWindowPos(GetHWND(), &vSwpScroll);
+ ::WinSetWindowPos( GetHWND()
+ ,HWND_TOP
+ ,vSwpScroll.x
+ ,vSwpScroll.y + nAdjustHeight
+ ,vSwpScroll.cx - nAdjustWidth
+ ,vSwpScroll.cy - nAdjustHeight
+ ,SWP_MOVE | SWP_SIZE
+ );
+ nYDiff -= nAdjustHeight;
+ }
+ MoveChildren(nYDiff);
+ ::WinQueryWindowPos(GetHwnd(), &m_vWinSwp);
}
+#if 0
+ // FIXME: By my logic, the next line should be needed as it moves child
+ // windows when resizing the parent (see comment at beginning of
+ // function). However, this seems to cause lots of problems. At
+ // least, e.g. the grid sample almost works with this line
+ // commented out but crashes badly with it.
+ MoveChildren(nHeightDelta);
+#endif
} // end of wxWindowOS2::DoMoveWindow
//
int nCurrentHeight;
wxSize vSize(-1, -1);
- GetPosition( &nCurrentX
- ,&nCurrentY
- );
- GetSize( &nCurrentWidth
- ,&nCurrentHeight
- );
+ GetPosition(&nCurrentX, &nCurrentY);
+ GetSize(&nCurrentWidth, &nCurrentHeight);
//
// ... and don't do anything (avoiding flicker) if it's already ok
//
- if ( nX == nCurrentX &&
- nY == nCurrentY &&
- nWidth == nCurrentWidth &&
- nHeight == nCurrentHeight
- )
+ //
+ // Must convert Y coords to test for equality under OS/2
+ //
+ int nY2 = nY;
+
+ if (nX == nCurrentX && nY2 == nCurrentY &&
+ nWidth == nCurrentWidth && nHeight == nCurrentHeight)
{
return;
}
if (nY == -1 && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE))
nY = nCurrentY;
- AdjustForParentClientOrigin( nX
- ,nY
- ,nSizeFlags
- );
+ AdjustForParentClientOrigin(nX, nY, nSizeFlags);
if (nWidth == -1)
{
, int nHeight
)
{
- wxWindow* pParent = GetParent();
- HWND hWnd = GetHwnd();
+ POINTL vPoint;
+ int nActualWidth;
+ int nActualHeight;
+ wxWindow* pParent = (wxWindow*)GetParent();
HWND hParentWnd = (HWND)0;
- HWND hClientWnd = (HWND)0;
- RECTL vRect;
- RECT vRect2;
- RECT vRect3;
-
- hClientWnd = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
- ::WinQueryWindowRect(hClientWnd, &vRect2);
if (pParent)
- hParentWnd = (HWND) pParent->GetHWND();
+ hParentWnd = (HWND)pParent->GetHWND();
- ::WinQueryWindowRect(hWnd, &vRect);
- ::WinQueryWindowRect(hParentWnd, &vRect3);
- //
- // Find the difference between the entire window (title bar and all)
- // and the client area; add this to the new client size to move the
- // window. OS/2 is backward from windows on height
- //
- int nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
- int nActualHeight = vRect2.yTop - vRect2.yBottom - vRect.yTop + nHeight;
+ if (IsKindOf(CLASSINFO(wxFrame)))
+ {
+ wxFrame* pFrame = wxDynamicCast(this, wxFrame);
+ HWND hFrame = pFrame->GetFrame();
+ RECTL vRect;
+ RECTL vRect2;
+ RECTL vRect3;
- //
- // If there's a parent, must subtract the parent's bottom left corner
- // since MoveWindow moves relative to the parent
- //
- POINTL vPoint;
+ ::WinQueryWindowRect(GetHwnd(), &vRect2);
+ ::WinQueryWindowRect(hFrame, &vRect);
+ ::WinQueryWindowRect(hParentWnd, &vRect3);
+ nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
+ nActualHeight = vRect2.yTop - vRect2.yBottom - vRect.yTop + nHeight;
- vPoint.x = vRect2.xLeft;
- vPoint.y = vRect2.yBottom;
- if (pParent)
- {
- vPoint.x -= vRect3.xLeft;
- vPoint.y -= vRect3.yBottom;
+ vPoint.x = vRect2.xLeft;
+ vPoint.y = vRect2.yBottom;
+ if (pParent)
+ {
+ vPoint.x -= vRect3.xLeft;
+ vPoint.y -= vRect3.yBottom;
+ }
}
+ else
+ {
+ int nX;
+ int nY;
+
+ GetPosition(&nX, &nY);
+ nActualWidth = nWidth;
+ nActualHeight = nHeight;
+ vPoint.x = nX;
+ vPoint.y = nY;
+ }
DoMoveWindow( vPoint.x
,vPoint.y
,nActualWidth
);
wxSizeEvent vEvent( wxSize( nWidth
- ,nHeight
- )
+ ,nHeight
+ )
,m_windowId
);
GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::DoSetClientSize
-wxPoint wxWindowOS2::GetClientAreaOrigin() const
-{
- return wxPoint(0, 0);
-} // end of wxWindowOS2::GetClientAreaOrigin
-
-void wxWindowOS2::AdjustForParentClientOrigin(
- int& rX
-, int& rY
-, int nSizeFlags
-)
-{
- //
- // Don't do it for the dialogs/frames - they float independently of their
- // parent
- //
- if (!IsTopLevel())
- {
- wxWindow* pParent = GetParent();
-
- if (!(nSizeFlags & wxSIZE_NO_ADJUSTMENTS) && pParent)
- {
- wxPoint vPoint(pParent->GetClientAreaOrigin());
- rX += vPoint.x;
- rY += vPoint.y;
- }
- }
-} // end of wxWindowOS2::AdjustForParentClientOrigin
-
// ---------------------------------------------------------------------------
// text metrics
// ---------------------------------------------------------------------------
{
HPS hPs;
FONTMETRICS vFontMetrics;
- BOOL bRc;
hPs = ::WinGetPS(GetHwnd());
, const wxFont* pTheFont
) const
{
- const wxFont* pFontToUse = pTheFont;
- HPS hPs;
+ POINTL avPoint[TXTBOX_COUNT];
+ POINTL vPtMin;
+ POINTL vPtMax;
+ int i;
+ int l;
+ FONTMETRICS vFM; // metrics structure
+ BOOL bRc = FALSE;
+ char* pStr;
+ HPS hPS;
- hPs = ::WinGetPS(GetHwnd());
-/*
-// TODO: Will have to play with fonts later
- if (!pFontToUse)
- pFontToUse = &m_font;
+ hPS = ::WinGetPS(GetHwnd());
- HFONT hFnt = 0;
- HFONT hFfontOld = 0;
+ l = rString.Length();
+ if (l > 0L)
+ {
+ pStr = (PCH)rString.c_str();
- if (pFontToUse && pFontToUse->Ok())
+ //
+ // In world coordinates.
+ //
+ bRc = ::GpiQueryTextBox( hPS
+ ,l
+ ,pStr
+ ,TXTBOX_COUNT // return maximum information
+ ,avPoint // array of coordinates points
+ );
+ if (bRc)
+ {
+ vPtMin.x = avPoint[0].x;
+ vPtMax.x = avPoint[0].x;
+ vPtMin.y = avPoint[0].y;
+ vPtMax.y = avPoint[0].y;
+ for (i = 1; i < 4; i++)
+ {
+ if(vPtMin.x > avPoint[i].x) vPtMin.x = avPoint[i].x;
+ if(vPtMin.y > avPoint[i].y) vPtMin.y = avPoint[i].y;
+ if(vPtMax.x < avPoint[i].x) vPtMax.x = avPoint[i].x;
+ if(vPtMax.y < avPoint[i].y) vPtMax.y = avPoint[i].y;
+ }
+ bRc = ::GpiQueryFontMetrics( hPS
+ ,sizeof(FONTMETRICS)
+ ,&vFM
+ );
+ if (!bRc)
+ {
+ vPtMin.x = 0;
+ vPtMin.y = 0;
+ vPtMax.x = 0;
+ vPtMax.y = 0;
+ }
+ }
+ else
+ {
+ vPtMin.x = 0;
+ vPtMin.y = 0;
+ vPtMax.x = 0;
+ vPtMax.y = 0;
+ }
+ }
+ else
{
- ::GpiCreateLog
- hFnt = (HFONT)((wxFont *)pFontToUse)->GetResourceHandle(); // const_cast
- if (hFnt)
- hFontOld = (HFONT)SelectObject(dc,fnt);
+ vPtMin.x = 0;
+ vPtMin.y = 0;
+ vPtMax.x = 0;
+ vPtMax.y = 0;
}
+ if (pX)
+ *pX = (vPtMax.x - vPtMin.x + 1);
+ if (pY)
+ *pY = (vPtMax.y - vPtMin.y + 1);
+ if (pDescent)
+ {
+ if (bRc)
+ *pDescent = vFM.lMaxDescender;
+ else
+ *pDescent = 0;
+ }
+ if (pExternalLeading)
+ {
+ if (bRc)
+ *pExternalLeading = vFM.lExternalLeading;
+ else
+ *pExternalLeading = 0;
+ }
+ ::WinReleasePS(hPS);
+} // end of wxWindow::GetTextExtent
- SIZE sizeRect;
- TEXTMETRIC tm;
- GetTextExtentPoint(dc, string, (int)string.Length(), &sizeRect);
- GetTextMetrics(dc, &tm);
-
- if ( fontToUse && fnt && hfontOld )
- SelectObject(dc, hfontOld);
-
- ReleaseDC(hWnd, dc);
-
- if ( x )
- *x = sizeRect.cx;
- if ( y )
- *y = sizeRect.cy;
- if ( descent )
- *descent = tm.tmDescent;
- if ( externalLeading )
- *externalLeading = tm.tmExternalLeading;
-*/
- ::WinReleasePS(hPs);
-}
-
-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
-
-void wxWindowOS2::CreateCaret(
- int nWidth
-, int nHeight
-)
-{
- SetCaret(new wxCaret( this
- ,nWidth
- ,nHeight
- ));
-} // end of wxWindowOS2::CreateCaret
-
-void wxWindowOS2::CreateCaret(
- const wxBitmap* pBitmap
-)
-{
- wxFAIL_MSG("not implemented");
-} // end of wxWindowOS2::CreateCaret
-
-void wxWindowOS2::ShowCaret(
- bool bShow
-)
-{
- wxCHECK_RET( m_caret, "no caret to show" );
-
- m_caret->Show(bShow);
-} // end of wxWindowOS2::ShowCaret
-
-void wxWindowOS2::DestroyCaret()
+bool wxWindowOS2::IsMouseInWindow() const
{
- SetCaret(NULL);
-} // end of wxWindowOS2::DestroyCaret
+ //
+ // Get the mouse position
+ POINTL vPt;
-void wxWindowOS2::SetCaretPos(
- int nX
-, int nY)
-{
- wxCHECK_RET( m_caret, "no caret to move" );
+ ::WinQueryPointerPos(HWND_DESKTOP, &vPt);
- m_caret->Move( nX
- ,nY
- );
-} // end of wxWindowOS2::SetCaretPos
+ //
+ // Find the window which currently has the cursor and go up the window
+ // chain until we find this window - or exhaust it
+ //
+ HWND hWnd = ::WinWindowFromPoint(HWND_DESKTOP, &vPt, TRUE);
-void wxWindowOS2::GetCaretPos(
- int* pX
-, int* pY
-) const
-{
- wxCHECK_RET( m_caret, "no caret to get position of" );
+ while (hWnd && (hWnd != GetHwnd()))
+ hWnd = ::WinQueryWindow(hWnd, QW_PARENT);
- m_caret->GetPosition( pX
- ,pY
- );
-} // end of wxWindowOS2::GetCaretPos
+ return hWnd != NULL;
+} // end of wxWindowOS2::IsMouseInWindow
-#endif //wxUSE_CARET
// ---------------------------------------------------------------------------
// popup menu
// ---------------------------------------------------------------------------
-
-static void wxYieldForCommandsOnly()
-{
- //
- // Peek all WM_COMMANDs (it will always return WM_QUIT too but we don't
- // want to process it here)
- //
- QMSG vMsg;
-
- while (::WinPeekMsg( vHabmain
- ,&vMsg
- ,(HWND)0
- ,WM_COMMAND
- ,WM_COMMAND
- ,PM_REMOVE
- ) && vMsg.msg != WM_QUIT)
- {
- wxTheApp->DoMessage((WXMSG*)&vMsg);
- }
-}
-
+//
+#if wxUSE_MENUS_NATIVE
bool wxWindowOS2::DoPopupMenu(
wxMenu* pMenu
, int nX
, int nY
)
{
- HWND hWnd = GetHwnd();
- HWND hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0;
+ HWND hWndOwner = GetHwnd();
+ HWND hWndParent = GetHwnd();
HWND hMenu = GetHmenuOf(pMenu);
+ bool bIsWaiting = TRUE;
+ int nHeight;
+
+ // Protect against recursion
+ if (wxCurrentPopupMenu)
+ return false;
pMenu->SetInvokingWindow(this);
pMenu->UpdateUI();
- DoClientToScreen( &nX
- ,&nY
- );
+ if ( nX == -1 && nY == -1 )
+ {
+ wxPoint mouse = wxGetMousePosition();
+ nX = mouse.x; nY = mouse.y;
+ }
+ else
+ {
+ DoClientToScreen( &nX
+ ,&nY
+ );
+ DoGetSize(0,&nHeight);
+ nY = nHeight - nY;
+ }
wxCurrentPopupMenu = pMenu;
::WinPopupMenu( hWndParent
- ,hWnd
+ ,hWndOwner
,hMenu
,nX
,nY
,0L
- ,PU_MOUSEBUTTON2DOWN | PU_MOUSEBUTTON2 | PU_KEYBOARD
+ ,PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_KEYBOARD
);
- // we need to do it righ now as otherwise the events are never going to be
- // sent to wxCurrentPopupMenu from HandleCommand()
- //
- // note that even eliminating (ugly) wxCurrentPopupMenu global wouldn't
- // help and we'd still need wxYieldForCommandsOnly() as the menu may be
- // destroyed as soon as we return (it can be a local variable in the caller
- // for example) and so we do need to process the event immediately
- wxYieldForCommandsOnly();
- wxCurrentPopupMenu = NULL;
+ while(bIsWaiting)
+ {
+ QMSG vMsg;
+
+ ::WinGetMsg(vHabmain,&vMsg, (HWND)0, 0, 0);
+ if (vMsg.msg == WM_COMMAND)
+ bIsWaiting = FALSE;
+ ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
+ }
+
+ wxCurrentPopupMenu = NULL;
pMenu->SetInvokingWindow(NULL);
return TRUE;
} // end of wxWindowOS2::DoPopupMenu
+#endif // wxUSE_MENUS_NATIVE
// ===========================================================================
// pre/post message processing
)
{
if (m_fnOldWndProc)
- return (MRESULT)m_fnOldWndProc(GetHWND(), (ULONG)uMsg, (MPARAM)wParam, (MPARAM)lParam);
+ return (MRESULT)m_fnOldWndProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam);
else
- return ::WinDefWindowProc(GetHWND(), (ULONG)uMsg, (MPARAM)wParam, (MPARAM)lParam);
+ return ::WinDefWindowProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam);
} // end of wxWindowOS2::OS2DefWindowProc
bool wxWindowOS2::OS2ProcessMessage(
WXMSG* pMsg
)
{
+// wxUniversal implements tab traversal itself
+#ifndef __WXUNIVERSAL__
QMSG* pQMsg = (QMSG*)pMsg;
if (m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL))
}
else
{
- wxPanel* pPanel = wxDynamicCast(this, wxPanel);
- wxButton* pBtn = NULL;
-
- if (pPanel)
- {
- //
- // Panel may have a default button which should
- // be activated by Enter
- //
- pBtn = pPanel->GetDefaultItem();
- }
+ wxButton* pBtn = wxDynamicCast( GetDefaultItem()
+ ,wxButton
+ );
if (pBtn && pBtn->IsEnabled())
{
pBtn->OS2Command(BN_CLICKED, 0 /* unused */);
return TRUE;
}
+ else if (!IsTopLevel())
+ {
+ //
+ // if not a top level window, let parent
+ // handle it
+ //
+ return FALSE;
+ }
// else: but if it does not it makes sense to make
// it work like a TAB - and that's what we do.
// Note that Ctrl-Enter always works this way.
if (::WinSendMsg(pQMsg->hwnd, WM_QUERYDLGCODE, pQMsg, 0));
return TRUE;
}
-
-#if wxUSE_TOOLTIPS
- if ( m_tooltip )
- {
- // relay mouse move events to the tooltip control
- QMSG* pQMsg = (QMSG*)pMsg;
-
- if (pQMsg->msg == WM_MOUSEMOVE )
- m_tooltip->RelayEvent(pMsg);
- }
-#endif // wxUSE_TOOLTIPS
+#else
+ pMsg = pMsg; // just shut up the compiler
+#endif // __WXUNIVERSAL__
return FALSE;
} // end of wxWindowOS2::OS2ProcessMessage
WXMSG* pMsg
)
{
-#if wxUSE_ACCEL
+#if wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
return m_acceleratorTable.Translate(m_hWnd, pMsg);
#else
+ pMsg = pMsg;
return FALSE;
#endif //wxUSE_ACCEL
} // end of wxWindowOS2::OS2TranslateMessage
+bool wxWindowOS2::OS2ShouldPreProcessMessage(
+ WXMSG* pMsg
+)
+{
+ // preprocess all messages by default
+ return TRUE;
+} // end of wxWindowOS2::OS2ShouldPreProcessMessage
+
// ---------------------------------------------------------------------------
// message params unpackers
// ---------------------------------------------------------------------------
} // end of wxWindowOS2::UnpackMenuSelect
// ---------------------------------------------------------------------------
-// Main wxWindows window proc and the window proc for wxWindow
+// Main wxWidgets window proc and the window proc for wxWindow
// ---------------------------------------------------------------------------
//
// Hook for new window just as it's being created, when the window isn't yet
// associated with the handle
//
-wxWindow* wxWndHook = NULL;
+wxWindowOS2* wxWndHook = NULL;
//
// Main window proc
, MPARAM lParam
)
{
- //
- // Trace all ulMsgs - useful for the debugging
- //
-#ifdef __WXDEBUG__
- wxLogTrace(wxTraceMessages, wxT("Processing %s(wParam=%8lx, lParam=%8lx)"),
- wxGetMessageName(ulMsg), wParam, lParam);
-#endif // __WXDEBUG__
-
- wxWindow* pWnd = wxFindWinFromHandle((WXHWND)hWnd);
+ wxWindowOS2* pWnd = wxFindWinFromHandle((WXHWND)hWnd);
//
// When we get the first message for the HWND we just created, we associate
else
{
if (pWnd)
+ {
rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam);
+ if ( (pWnd->GetScrollBarHorz() != NULLHANDLE ||
+ pWnd->GetScrollBarVert() != NULLHANDLE) &&
+ ulMsg == WM_PAINT)
+ {
+ if (pWnd->GetScrollBarHorz() != NULLHANDLE)
+ ::WinInvalidateRect(pWnd->GetScrollBarHorz(), NULL, TRUE);
+ if (pWnd->GetScrollBarVert() != NULLHANDLE)
+ ::WinInvalidateRect(pWnd->GetScrollBarVert(), NULL, TRUE);
+ }
+ }
else
rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
}
// Did we process the uMsg?
//
bool bProcessed = FALSE;
- bool bAllow;
MRESULT mResult;
- WXHICON hIcon;
- WXHBRUSH hBrush;
//
// For most messages we should return 0 when we do process the message
);
break;
+ case WM_WINDOWPOSCHANGED:
+
+ //
+ // Dialogs under OS/2 do not get WM_SIZE events at all.
+ // Instead they get this, which can function much like WM_SIZE
+ // PSWP contains the new sizes and positioning, PSWP+1 the old
+ // We use this because ADJUSTWINDOWPOS comes BEFORE the new
+ // position is added and our auto layout does a WinQueryWindowRect
+ // to get the CURRENT client size. That is the size used to position
+ // child controls, so we need to already be sized
+ // in order to get the child controls positoned properly.
+ //
+ if (IsKindOf(CLASSINFO(wxDialog)) || IsKindOf(CLASSINFO(wxFrame)))
+ {
+ PSWP pSwp = (PSWP)PVOIDFROMMP(wParam);
+ PSWP pSwp2 = pSwp++;
+
+ if (!(pSwp->cx == pSwp2->cx &&
+ pSwp->cy == pSwp2->cy))
+ bProcessed = HandleSize( pSwp->cx
+ ,pSwp->cy
+ ,(WXUINT)lParam
+ );
+ if (IsKindOf(CLASSINFO(wxFrame)))
+ {
+ wxFrame* pFrame = wxDynamicCast(this, wxFrame);
+
+ if (pFrame)
+ {
+ if (pFrame->GetStatusBar())
+ pFrame->PositionStatusBar();
+ if (pFrame->GetToolBar())
+ pFrame->PositionToolBar();
+ }
+ }
+ }
+ break;
+
case WM_ACTIVATE:
{
WXWORD wState;
case WM_BUTTON3MOTIONEND:
case WM_BUTTON3MOTIONSTART:
{
- short x = LOWORD(lParam);
- short y = HIWORD(lParam);
+ if (uMsg == WM_BUTTON1DOWN && AcceptsFocus())
+ SetFocus();
- bProcessed = HandleMouseEvent(uMsg, x, y, (WXUINT)wParam);
+ short nX = LOWORD(wParam);
+ short nY = HIWORD(wParam);
+
+ //
+ // Redirect the event to a static control if necessary
+ //
+ if (this == GetCapture())
+ {
+ bProcessed = HandleMouseEvent( uMsg
+ ,nX
+ ,nY
+ ,(WXUINT)SHORT2FROMMP(lParam)
+ );
+ }
+ else
+ {
+ wxWindow* pWin = FindWindowForMouseEvent( this
+ ,&nX
+ ,&nY
+ );
+ if (!pWin->IsOfStandardClass())
+ {
+ if (uMsg == WM_BUTTON1DOWN && pWin->AcceptsFocus() )
+ pWin->SetFocus();
+ }
+ bProcessed = pWin->HandleMouseEvent( uMsg
+ ,nX
+ ,nY
+ ,(WXUINT)SHORT2FROMMP(lParam)
+ );
+ }
}
break;
+
case WM_SYSCOMMAND:
bProcessed = HandleSysCommand(wParam, lParam);
break;
}
else
{
- bProcessed = OS2OnMeasureItem(nIdCtrl,
- (WXMEASUREITEMSTRUCT *)lParam);
+ return MRFROMLONG(OS2OnMeasureItem( nIdCtrl
+ ,(WXMEASUREITEMSTRUCT *)lParam
+ ));
}
if ( bProcessed )
break;
case WM_QUERYDLGCODE:
- if ( m_lDlgCode )
+ if (!IsOfStandardClass())
{
- mResult = (MRESULT)m_lDlgCode;
- bProcessed = TRUE;
+ if ( m_lDlgCode )
+ {
+ mResult = (MRESULT)m_lDlgCode;
+ bProcessed = TRUE;
+ }
}
//
//else: get the dlg code from the DefWindowProc()
if (uKeyFlags & KC_KEYUP)
{
- bProcessed = HandleKeyUp((WXDWORD)wParam, lParam);
+ //TODO: check if the cast to WXWORD isn't causing trouble
+ bProcessed = HandleKeyUp(wParam, lParam);
break;
}
else // keydown event
{
+ m_bLastKeydownProcessed = FALSE;
//
// If this has been processed by an event handler,
// return 0 now (we've handled it). DON't RETURN
// we still need to process further
//
- HandleKeyDown((WXDWORD)wParam, lParam);
+ m_bLastKeydownProcessed = HandleKeyDown(wParam, lParam);
if (uKeyFlags & KC_VIRTUALKEY)
{
USHORT uVk = SHORT2FROMMP((MPARAM)lParam);
//
// We consider these message "not interesting" to OnChar
//
- if (uVk == VK_SHIFT || uVk == VK_CTRL )
- {
- bProcessed = TRUE;
- break;
- }
switch(uVk)
{
- //
+ case VK_SHIFT:
+ case VK_CTRL:
+ case VK_MENU:
+ case VK_CAPSLOCK:
+ case VK_NUMLOCK:
+ case VK_SCRLLOCK:
+ bProcessed = TRUE;
+ break;
+
// Avoid duplicate messages to OnChar for these ASCII keys: they
// will be translated by TranslateMessage() and received in WM_CHAR
case VK_ESC:
- case VK_SPACE:
case VK_ENTER:
case VK_BACKSPACE:
case VK_TAB:
bProcessed = FALSE;
break;
- case VK_LEFT:
- case VK_RIGHT:
- case VK_DOWN:
- case VK_UP:
default:
- bProcessed = HandleChar((WXDWORD)wParam, lParam);
+ bProcessed = HandleChar(wParam, lParam);
}
break;
}
else // WM_CHAR -- Always an ASCII character
{
- bProcessed = HandleChar((WXDWORD)wParam, lParam, TRUE);
- break;
+ if (m_bLastKeydownProcessed)
+ {
+ //
+ // The key was handled in the EVT_KEY_DOWN and handling
+ // a key in an EVT_KEY_DOWN handler is meant, by
+ // design, to prevent EVT_CHARs from happening
+ //
+ m_bLastKeydownProcessed = FALSE;
+ bProcessed = TRUE;
+ }
+ else // do generate a CHAR event
+ {
+ bProcessed = HandleChar(wParam, lParam, TRUE);
+ break;
+ }
}
}
}
}
break;
+ case WM_CONTROL:
+ switch(SHORT2FROMMP(wParam))
+ {
+ case BN_PAINT:
+ {
+ HWND hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam));
+ wxWindowOS2* pWin = wxFindWinFromHandle(hWnd);
+
+ if (!pWin)
+ {
+ bProcessed = FALSE;
+ break;
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxBitmapButton)))
+ {
+ wxBitmapButton* pBitmapButton = wxDynamicCast(pWin, wxBitmapButton);
+
+ pBitmapButton->OS2OnDraw((WXDRAWITEMSTRUCT *)lParam);
+ }
+ return 0;
+ }
+ break;
+
+ case BKN_PAGESELECTEDPENDING:
+ {
+ PPAGESELECTNOTIFY pPage = (PPAGESELECTNOTIFY)lParam;
+
+ if ((pPage->ulPageIdNew != pPage->ulPageIdCur) &&
+ (pPage->ulPageIdNew > 0L && pPage->ulPageIdCur > 0L))
+ {
+ wxWindowOS2* pWin = wxFindWinFromHandle(pPage->hwndBook);
+ wxNotebookEvent vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
+ ,(int)SHORT1FROMMP(wParam)
+ ,(int)pPage->ulPageIdNew
+ ,(int)pPage->ulPageIdCur
+ );
+ if (!pWin)
+ {
+ bProcessed = FALSE;
+ break;
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxNotebook)))
+ {
+ wxNotebook* pNotebook = wxDynamicCast(pWin, wxNotebook);
+
+ vEvent.SetEventObject(pWin);
+ pNotebook->OnSelChange(vEvent);
+ bProcessed = TRUE;
+ }
+ else
+ bProcessed = FALSE;
+ }
+ else
+ bProcessed = FALSE;
+ }
+ break;
+
+ case BN_CLICKED: // Dups as LN_SELECT and CBN_LBSELECT
+ {
+ HWND hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam));
+ wxWindowOS2* pWin = wxFindWinFromHandle(hWnd);
+
+ if (!pWin)
+ {
+ bProcessed = FALSE;
+ break;
+ }
+ //
+ // Simulate a WM_COMMAND here, as wxWidgets expects all control
+ // button clicks to generate WM_COMMAND msgs, not WM_CONTROL
+ //
+ if (pWin->IsKindOf(CLASSINFO(wxRadioBox)))
+ {
+ wxRadioBox* pRadioBox = wxDynamicCast(pWin, wxRadioBox);
+
+ pRadioBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+ ,(WXUINT)SHORT1FROMMP(wParam)
+ );
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxRadioButton)))
+ {
+ wxRadioButton* pRadioButton = wxDynamicCast(pWin, wxRadioButton);
+
+ pRadioButton->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+ ,(WXUINT)SHORT1FROMMP(wParam)
+ );
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxCheckBox)))
+ {
+ wxCheckBox* pCheckBox = wxDynamicCast(pWin, wxCheckBox);
+
+ pCheckBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+ ,(WXUINT)SHORT1FROMMP(wParam)
+ );
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxListBox)))
+ {
+ wxListBox* pListBox = wxDynamicCast(pWin, wxListBox);
+
+ pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+ ,(WXUINT)SHORT1FROMMP(wParam)
+ );
+ if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW)
+ Refresh();
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxComboBox)))
+ {
+ wxComboBox* pComboBox = wxDynamicCast(pWin, wxComboBox);
+
+ pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+ ,(WXUINT)SHORT1FROMMP(wParam)
+ );
+ }
+ return 0;
+ }
+ break;
+
+ case LN_ENTER: /* dups as CBN_EFCHANGE */
+ {
+ HWND hWnd = HWNDFROMMP(lParam);
+ wxWindowOS2* pWin = wxFindWinFromHandle(hWnd);
+
+ if (!pWin)
+ {
+ bProcessed = FALSE;
+ break;
+ }
+ //
+ // Simulate a WM_COMMAND here, as wxWidgets expects all control
+ // button clicks to generate WM_COMMAND msgs, not WM_CONTROL
+ //
+ if (pWin->IsKindOf(CLASSINFO(wxListBox)))
+ {
+ wxListBox* pListBox = wxDynamicCast(pWin, wxListBox);
+
+ pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+ ,(WXUINT)SHORT1FROMMP(wParam)
+ );
+ if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW)
+ Refresh();
+
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxComboBox)))
+ {
+ wxComboBox* pComboBox = wxDynamicCast(pWin, wxComboBox);
+
+ pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+ ,(WXUINT)SHORT1FROMMP(wParam)
+ );
+ }
+ return 0;
+ }
+ break;
+
+ case SPBN_UPARROW:
+ case SPBN_DOWNARROW:
+ case SPBN_CHANGE:
+ {
+ char zVal[10];
+ long lVal;
+
+ ::WinSendMsg( HWNDFROMMP(lParam)
+ ,SPBM_QUERYVALUE
+ ,&zVal
+ ,MPFROM2SHORT( (USHORT)10
+ ,(USHORT)SPBQ_UPDATEIFVALID
+ )
+ );
+ lVal = atol(zVal);
+ bProcessed = OS2OnScroll( wxVERTICAL
+ ,(int)SHORT2FROMMP(wParam)
+ ,(int)lVal
+ ,HWNDFROMMP(lParam)
+ );
+ }
+ break;
+
+ case SLN_SLIDERTRACK:
+ {
+ HWND hWnd = ::WinWindowFromID(GetHWND(), SHORT1FROMMP(wParam));
+ wxWindowOS2* pChild = wxFindWinFromHandle(hWnd);
+
+ if (!pChild)
+ {
+ bProcessed = FALSE;
+ break;
+ }
+ if (pChild->IsKindOf(CLASSINFO(wxSlider)))
+ bProcessed = OS2OnScroll( wxVERTICAL
+ ,(int)SHORT2FROMMP(wParam)
+ ,(int)LONGFROMMP(lParam)
+ ,hWnd
+ );
+ }
+ break;
+ }
+ break;
+
#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
case WM_CTLCOLORCHANGE:
{
mResult = (MRESULT)(FALSE);
break;
- //
- // Instead of CTLCOLOR messages PM sends QUERYWINDOWPARAMS to
- // things such as colors and fonts and such
- //
- case WM_QUERYWINDOWPARAMS:
- {
- PWNDPARAMS pWndParams = (PWNDPARAMS)wParam;
-
- bProcessed = HandleWindowParams( pWndParams
- ,lParam
- );
- }
- break;
-
// the return value for this message is ignored
case WM_SYSCOLORCHANGE:
bProcessed = HandleSysColorChange();
bProcessed = HandlePaletteChanged();
break;
- case WM_PRESPARAMCHANGED:
- bProcessed = HandlePresParamChanged(wParam);
- break;
-
-
// move all drag and drops to wxDrg
case WM_ENDDRAG:
bProcessed = HandleEndDrag(wParam);
if ( bProcessed )
{
// we never set focus from here
- mResult = FALSE;
+ mResult = (MRESULT)FALSE;
}
break;
mResult = (MRESULT)TRUE;
}
break;
+
+#if wxUSE_MENUS_NATIVE
+ case WM_MENUEND:
+ if (wxCurrentPopupMenu)
+ {
+ if (GetHmenuOf(wxCurrentPopupMenu) == (HWND)lParam)
+ {
+ // Break out of msg loop in DoPopupMenu
+ ::WinPostMsg((HWND)lParam,WM_COMMAND,wParam,0);
+ }
+ }
+ break;
+#endif // wxUSE_MENUS_NATIVE
+
}
if (!bProcessed)
{
#endif // __WXDEBUG__
if (IsKindOf(CLASSINFO(wxFrame)))
mResult = ::WinDefWindowProc(m_hWnd, uMsg, wParam, lParam);
+ else if (IsKindOf(CLASSINFO(wxDialog)))
+ mResult = ::WinDefDlgProc( m_hWnd, uMsg, wParam, lParam);
else
mResult = OS2DefWindowProc(uMsg, wParam, lParam);
}
return mResult;
} // end of wxWindowOS2::OS2WindowProc
-//
-// Dialog window proc
-//
-MRESULT wxDlgProc(
- HWND hWnd
-, UINT uMsg
-, MPARAM wParam
-, MPARAM lParam)
-{
- if (uMsg == WM_INITDLG)
- {
- //
- // For this message, returning TRUE tells system to set focus to the
- // first control in the dialog box
- //
- return (MRESULT)TRUE;
- }
- else
- {
- //
- // For all the other ones, FALSE means that we didn't process the
- // message
- //
- return (MRESULT)0;
- }
-} // end of wxDlgProc
+// ----------------------------------------------------------------------------
+// wxWindow <-> HWND map
+// ----------------------------------------------------------------------------
+
+wxWinHashTable *wxWinHandleHash = NULL;
wxWindow* wxFindWinFromHandle(
WXHWND hWnd
)
{
- wxNode* pNode = wxWinHandleList->Find((long)hWnd);
-
- if (!pNode)
- return NULL;
- return (wxWindow *)pNode->Data();
+ return (wxWindow *)wxWinHandleHash->Get((long)hWnd);
} // end of wxFindWinFromHandle
void wxAssociateWinWithHandle(
HWND hWnd
-, wxWindow* pWin
+, wxWindowOS2* pWin
)
{
//
if (pOldWin && (pOldWin != pWin))
{
wxString str(pWin->GetClassInfo()->GetClassName());
- wxLogError( "Bug! Found existing HWND %X for new window of class %s"
+
+ wxLogError( _T("Bug! Found existing HWND %X for new window of class %s")
,(int)hWnd
- ,(const char*)str
+ ,str.c_str()
);
}
else if (!pOldWin)
{
- wxWinHandleList->Append( (long)hWnd
- ,pWin
- );
+ wxWinHandleHash->Put( (long)hWnd
+ ,(wxWindow *)pWin
+ );
}
} // end of wxAssociateWinWithHandle
void wxRemoveHandleAssociation(
- wxWindow* pWin
+ wxWindowOS2* pWin
)
{
- wxWinHandleList->DeleteObject(pWin);
+ wxWinHandleHash->Delete((long)pWin->GetHWND());
} // end of wxRemoveHandleAssociation
//
{
}
-void wxWindowOS2::OS2DetachWindowMenu()
+bool wxWindowOS2::OS2GetCreateWindowCoords(
+ const wxPoint& rPos
+, const wxSize& rSize
+, int& rnX
+, int& rnY
+, int& rnWidth
+, int& rnHeight
+) const
{
- if (m_hMenu)
- {
- HMENU hMenu = (HMENU)m_hMenu;
-
- int nN = (int)::WinSendMsg(hMenu, MM_QUERYITEMCOUNT, 0, 0);
- int i;
-
- for (i = 0; i < nN; i++)
- {
- wxChar zBuf[100];
- int nChars = (int)::WinSendMsg( hMenu
- ,MM_QUERYITEMTEXT
- ,MPFROM2SHORT(i, nN)
- ,zBuf
- );
- if (!nChars)
- {
- wxLogLastError(wxT("GetMenuString"));
- continue;
- }
+ bool bNonDefault = FALSE;
+ static const int DEFAULT_Y = 200;
+ static const int DEFAULT_H = 250;
- if (wxStrcmp(zBuf, wxT("&Window")) == 0)
- {
- ::WinSendMsg(hMenu, MM_DELETEITEM, MPFROM2SHORT(i, TRUE), 0);
- break;
- }
- }
+ if (rPos.x == -1)
+ {
+ rnX = rnY = CW_USEDEFAULT;
+ }
+ else
+ {
+ rnX = rPos.x;
+ rnY = rPos.y == -1 ? DEFAULT_Y : rPos.y;
+ bNonDefault = TRUE;
+ }
+ if (rSize.x == -1)
+ {
+ rnWidth = rnHeight = CW_USEDEFAULT;
}
-} // end of wxWindowOS2::OS2DetachWindowMenu
+ else
+ {
+ rnWidth = rSize.x;
+ rnHeight = rSize.y == -1 ? DEFAULT_H : rSize.y;
+ bNonDefault = TRUE;
+ }
+ return bNonDefault;
+} // end of wxWindowOS2::OS2GetCreateWindowCoords
+
+WXHWND wxWindowOS2::OS2GetParent() const
+{
+ return m_parent ? m_parent->GetHWND() : NULL;
+}
bool wxWindowOS2::OS2Create(
- WXHWND hParent
-, PSZ zClass
+ PSZ zClass
, const wxChar* zTitle
, WXDWORD dwStyle
-, long lX
-, long lY
-, long lWidth
-, long lHeight
-, WXHWND hOwner
-, WXHWND hZOrder
-, unsigned long ulId
+, const wxPoint& rPos
+, const wxSize& rSize
, void* pCtlData
-, void* pPresParams
, WXDWORD dwExStyle
+, bool bIsChild
)
{
ERRORID vError;
wxString sError;
- long lX1 = 0L;
- long lY1 = 0L;
- 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
- // panel size the size of the parent window
- //
- RECTL vParentRect;
- HWND hWndClient;
-
- lX1 = lX;
- lY1 = lY;
- if (lWidth > -1L)
- lWidth1 = lWidth;
- if (lHeight > -1L)
- lHeight1 = lHeight;
-
- wxWndHook = this;
+ int nX = 0L;
+ int nY = 0L;
+ int nWidth = 0L;
+ int nHeight = 0L;
+ long lControlId = 0L;
+ wxWindowCreationHook vHook(this);
+ wxString sClassName((wxChar*)zClass);
+
+ OS2GetCreateWindowCoords( rPos
+ ,rSize
+ ,nX
+ ,nY
+ ,nWidth
+ ,nHeight
+ );
- //
- // check to see if the new window is a standard control
- //
- if ((ULONG)zClass == (ULONG)WC_BUTTON ||
- (ULONG)zClass == (ULONG)WC_COMBOBOX ||
- (ULONG)zClass == (ULONG)WC_CONTAINER ||
- (ULONG)zClass == (ULONG)WC_ENTRYFIELD ||
- (ULONG)zClass == (ULONG)WC_FRAME ||
- (ULONG)zClass == (ULONG)WC_LISTBOX ||
- (ULONG)zClass == (ULONG)WC_MENU ||
- (ULONG)zClass == (ULONG)WC_NOTEBOOK ||
- (ULONG)zClass == (ULONG)WC_SCROLLBAR ||
- (ULONG)zClass == (ULONG)WC_SPINBUTTON ||
- (ULONG)zClass == (ULONG)WC_STATIC ||
- (ULONG)zClass == (ULONG)WC_TITLEBAR ||
- (ULONG)zClass == (ULONG)WC_VALUESET
- )
- {
- nControlId = ulId;
- }
- else
+ if (bIsChild)
{
- // no standard controls
- if(wxString (wxT("wxFrameClass")) == wxString(zClass) )
- {
- pszClass = WC_FRAME;
- nNeedsubclass = 1;
- }
- else
+ lControlId = GetId();
+ if (GetWindowStyleFlag() & wxCLIP_SIBLINGS)
{
- nControlId = ulId;
- if(nControlId < 0)
- nControlId = FID_CLIENT;
+ dwStyle |= WS_CLIPSIBLINGS;
}
}
-
//
- // We will either have a registered class via string name or a standard PM Class via a long
+ // For each class "Foo" we have we also have "FooNR" ("no repaint") class
+ // which is the same but without CS_[HV]REDRAW class styles so using it
+ // ensures that the window is not fully repainted on each resize
//
- m_hWnd = (WXHWND)::WinCreateWindow( (HWND)hParent
- ,zClass
- ,(PSZ)zTitle ? zTitle : wxT("")
+ if (!HasFlag(wxFULL_REPAINT_ON_RESIZE))
+ {
+ sClassName += wxT("NR");
+ }
+ m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent()
+ ,(PSZ)sClassName.c_str()
+ ,(PSZ)(zTitle ? zTitle : wxEmptyString)
,(ULONG)dwStyle
- ,(LONG)lX1
- ,(LONG)lY1
- ,(LONG)lWidth
- ,(LONG)lHeight
- ,hOwner
+ ,(LONG)0L
+ ,(LONG)0L
+ ,(LONG)0L
+ ,(LONG)0L
+ ,NULLHANDLE
,HWND_TOP
- ,(ULONG)nControlId
+ ,(ULONG)lControlId
,pCtlData
- ,pPresParams
+ ,NULL
);
if (!m_hWnd)
{
- vError = ::WinGetLastError(vHabmain);
+ vError = ::WinGetLastError(wxGetInstance());
sError = wxPMErrorToStr(vError);
- wxLogError("Can't create window of class %s!. Error: %s\n", zClass, sError);
return FALSE;
}
- m_dwExStyle = dwExStyle;
- ::WinSetWindowULong(m_hWnd, QWL_USER, (ULONG) this);
- wxWndHook = NULL;
+ SubclassWin(m_hWnd);
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-#ifdef __WXDEBUG__
- wxNode* pNode = wxWinHandleList->Member(this);
-
- if (pNode)
- {
- HWND hWnd = (HWND)pNode->GetKeyInteger();
+ m_backgroundColour.Set(wxString(wxT("GREY")));
- if (hWnd != (HWND)m_hWnd)
+ LONG lColor = (LONG)m_backgroundColour.GetPixel();
- {
- wxLogError("A second HWND association is being added for the same window!");
- }
- }
-#endif
- wxAssociateWinWithHandle((HWND)m_hWnd
- ,this
- );
- //
- // Now need to subclass window.
- //
- if(!nNeedsubclass)
- {
- wxAssociateWinWithHandle((HWND)m_hWnd,this);
- }
- else
+ if (!::WinSetPresParam( m_hWnd
+ ,PP_BACKGROUNDCOLOR
+ ,sizeof(LONG)
+ ,(PVOID)&lColor
+ ))
{
- SubclassWin(GetHWND());
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());
+ return FALSE;
}
+ SetSize( nX
+ ,nY
+ ,nWidth
+ ,nHeight
+ );
return TRUE;
-} // end of wxWindowOS2::OS2Create
+} // end of WinGuiBase_Window::OS2Create
// ===========================================================================
// OS2 PM message handlers
// ---------------------------------------------------------------------------
bool wxWindowOS2::HandleCreate(
- WXLPCREATESTRUCT vCs
+ WXLPCREATESTRUCT WXUNUSED(vCs)
, bool* pbMayCreate
)
{
- wxWindowCreateEvent vEvent(this);
+ wxWindowCreateEvent vEvent((wxWindow*)this);
(void)GetEventHandler()->ProcessEvent(vEvent);
*pbMayCreate = TRUE;
bool wxWindowOS2::HandleDestroy()
{
- wxWindowDestroyEvent vEvent(this);
-
+ wxWindowDestroyEvent vEvent((wxWindow*)this);
+ vEvent.SetId(GetId());
(void)GetEventHandler()->ProcessEvent(vEvent);
//
#if wxUSE_DRAG_AND_DROP
if (m_dropTarget != NULL)
{
- m_dropTarget->Revoke(m_hWnd);
delete m_dropTarget;
m_dropTarget = NULL;
}
wxFocusEvent& rEvent
)
{
- //
- // Panel wants to track the window which was the last to have focus in it,
- // so we want to set ourselves as the window which last had focus
- //
- // Notice that it's also important to do it upwards the tree becaus
- // otherwise when the top level panel gets focus, it won't set it back to
- // us, but to some other sibling
- //
- wxWindow* pWin = this;
-
- while (pWin)
- {
- wxWindow* pParent = pWin->GetParent();
- wxPanel* pPanel = wxDynamicCast( pParent
- ,wxPanel
- );
- if (pPanel)
- {
- pPanel->SetLastFocus(pWin);
- }
- pWin = pParent;
- }
-
- wxLogTrace(_T("focus"), _T("%s (0x%08x) gets focus"),
- GetClassInfo()->GetClassName(), GetHandle());
-
rEvent.Skip();
} // end of wxWindowOS2::OnSetFocus
WXHWND WXUNUSED(hWnd)
)
{
+ //
+ // Notify the parent keeping track of focus for the kbd navigation
+ // purposes that we got it
+ //
+ wxChildFocusEvent vEventFocus((wxWindow *)this);
+ (void)GetEventHandler()->ProcessEvent(vEventFocus);
+
#if wxUSE_CARET
//
// Deal with caret
}
#endif // wxUSE_CARET
- //
- // Panel wants to track the window which was the last to have focus in it
- //
- wxPanel* pPanel = wxDynamicCast( GetParent()
- ,wxPanel
- );
- if (pPanel)
+#if wxUSE_TEXTCTRL
+ // If it's a wxTextCtrl don't send the event as it will be done
+ // after the control gets to process it from EN_FOCUS handler
+ if ( wxDynamicCastThis(wxTextCtrl) )
{
- pPanel->SetLastFocus(this);
+ return FALSE;
}
+#endif // wxUSE_TEXTCTRL
wxFocusEvent vEvent(wxEVT_SET_FOCUS, m_windowId);
} // end of wxWindowOS2::HandleSetFocus
bool wxWindowOS2::HandleKillFocus(
- WXHWND WXUNUSED(hWnd)
+ WXHWND hWnd
)
{
#if wxUSE_CARET
//
if (m_caret)
{
- m_caret->OnKillFocus();
+ m_caret->OnKillFocus();
+ }
+#endif // wxUSE_CARET
+
+#if wxUSE_TEXTCTRL
+ //
+ // If it's a wxTextCtrl don't send the event as it will be done
+ // after the control gets to process it.
+ //
+ wxTextCtrl* pCtrl = wxDynamicCastThis(wxTextCtrl);
+
+ if (pCtrl)
+ {
+ return FALSE;
+ }
+#endif
+
+ //
+ // Don't send the event when in the process of being deleted. This can
+ // only cause problems if the event handler tries to access the object.
+ //
+ if ( m_isBeingDeleted )
+ {
+ return FALSE;
}
-#endif // wxUSE_CARET
wxFocusEvent vEvent( wxEVT_KILL_FOCUS
,m_windowId
);
vEvent.SetEventObject(this);
+
+ //
+ // wxFindWinFromHandle() may return NULL, it is ok
+ //
+ vEvent.SetWindow(wxFindWinFromHandle(hWnd));
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleKillFocus
bool wxWindowOS2::HandleShow(
bool bShow
-, int nStatus
+, int WXUNUSED(nStatus)
)
{
- wxShowEvent vEvent( GetId()
- ,bShow
- );
+ wxShowEvent vEvent(GetId(), bShow);
- vEvent.m_eventObject = this;
+ vEvent.SetEventObject(this);
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleShow
{
wxInitDialogEvent vEvent(GetId());
- vEvent.m_eventObject = this;
+ vEvent.SetEventObject(this);
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandleInitDialog
-bool wxWindowOS2::HandleEndDrag(WXWPARAM wParam)
+bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam))
{
// TODO: We'll handle drag and drop later
return FALSE;
}
bool wxWindowOS2::HandleSetCursor(
- USHORT vId
+ USHORT WXUNUSED(vId)
, WXHWND hPointer
)
{
, WXDRAWITEMSTRUCT* pItemStruct
)
{
+#if wxUSE_OWNER_DRAWN
wxDC vDc;
-#if wxUSE_OWNER_DRAWN
+#if wxUSE_MENUS_NATIVE
//
// Is it a menu item?
//
);
vDc.SetHPS(pMeasureStruct->hps);
//
- // Load the wxWindows Pallete and set to RGB mode
+ // Load the wxWidgets Pallete and set to RGB mode
//
if (!::GpiCreateLogColorTable( pMeasureStruct->hps
,0L
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Unable to set current color table. Error: %s\n", sError);
+ wxLogError(_T("Unable to set current color table. Error: %s\n"), sError.c_str());
}
//
// Set the color table to RGB mode
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Unable to set current color table. Error: %s\n", sError);
+ wxLogError(_T("Unable to set current color table. Error: %s\n"), sError.c_str());
}
wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
// otherwise, we'd have to do it ourselves.
//
}
+#endif // wxUSE_MENUS_NATIVE
wxWindow* pItem = FindItem(vId);
{
return ((wxControl *)pItem)->OS2OnDraw(pItemStruct);
}
+#else
+ vId = vId;
+ pItemStruct = pItemStruct;
#endif
return FALSE;
} // end of wxWindowOS2::OS2OnDrawItem
-bool wxWindowOS2::OS2OnMeasureItem(
+long wxWindowOS2::OS2OnMeasureItem(
int lId
, WXMEASUREITEMSTRUCT* pItemStruct
)
{
+#if wxUSE_OWNER_DRAWN
//
// Is it a menu item?
//
,&nHeight
))
{
+ MRESULT mRc;
+
pMeasureStruct->rclItem.xRight = nWidth;
pMeasureStruct->rclItem.xLeft = 0L;
pMeasureStruct->rclItem.yTop = nHeight;
pMeasureStruct->rclItem.yBottom = 0L;
- return TRUE;
+ mRc = MRFROM2SHORT(nHeight, nWidth);
+ return LONGFROMMR(mRc);
}
- return FALSE;
+ return 0L;
}
}
wxWindow* pItem = FindItem(lId);
if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
{
- return ((wxControl *)pItem)->OS2OnMeasure(pItemStruct);
+ OWNERITEM vItem;
+
+ vItem.idItem = (LONG)pItemStruct;
+ return ((wxControl *)pItem)->OS2OnMeasure((WXMEASUREITEMSTRUCT*)&vItem);
}
+#else
+ lId = lId;
+ pItemStruct = pItemStruct;
+#endif // wxUSE_OWNER_DRAWN
return FALSE;
}
} // end of wxWindowOS2::HandleSysColorChange
bool wxWindowOS2::HandleCtlColor(
- WXHBRUSH* phBrush
+ WXHBRUSH* WXUNUSED(phBrush)
)
{
//
return TRUE;
} // end of wxWindowOS2::HandleCtlColor
-bool wxWindowOS2::HandleWindowParams(
- PWNDPARAMS pWndParams
-, WXLPARAM lParam
-)
-{
-// TODO: I'll do something here, just not sure what yet
- return TRUE;
-}
// Define for each class of dialog and control
-WXHBRUSH wxWindowOS2::OnCtlColor(WXHDC hDC,
- WXHWND hWnd,
- WXUINT nCtlColor,
- WXUINT message,
- WXWPARAM wParam,
- WXLPARAM lParam)
+WXHBRUSH wxWindowOS2::OnCtlColor(WXHDC WXUNUSED(hDC),
+ WXHWND WXUNUSED(hWnd),
+ WXUINT WXUNUSED(nCtlColor),
+ WXUINT WXUNUSED(message),
+ WXWPARAM WXUNUSED(wParam),
+ WXLPARAM WXUNUSED(lParam))
{
return (WXHBRUSH)0;
}
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::HandlePaletteChanged
-bool wxWindowOS2::HandlePresParamChanged(
- WXWPARAM wParam
-)
-{
- //
- // TODO: Once again I'll do something here when I need it
- //
- //wxQueryNewPaletteEvent event(GetId());
- //event.SetEventObject(this);
- // if the background is erased
-// bProcessed = HandleEraseBkgnd((WXHDC)(HDC)wParam);
-
- return FALSE; //GetEventHandler()->ProcessEvent(event) && event.GetPaletteRealized();
-}
-
//
// Responds to colour changes: passes event on to children.
//
wxSysColourChangedEvent& rEvent
)
{
- wxNode* pNode = GetChildren().First();
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- while (pNode)
+ while (node)
{
//
// Only propagate to non-top-level windows
//
- wxWindow* pWin = (wxWindow *)pNode->Data();
+ wxWindow* pWin = (wxWindow *)node->GetData();
if (pWin->GetParent())
{
wxSysColourChangedEvent vEvent;
- rEvent.m_eventObject = pWin;
+ rEvent.SetEventObject(pWin);
pWin->GetEventHandler()->ProcessEvent(vEvent);
}
- pNode = pNode->Next();
+ node = node->GetNext();
}
} // end of wxWindowOS2::OnSysColourChanged
// painting
// ---------------------------------------------------------------------------
+void wxWindow::OnPaint (
+ wxPaintEvent& rEvent
+)
+{
+ HDC hDC = (HDC)wxPaintDC::FindDCInCache((wxWindow*) rEvent.GetEventObject());
+
+ if (hDC != 0)
+ {
+ OS2DefWindowProc( (WXUINT)WM_PAINT
+ ,(WXWPARAM)hDC
+ ,(WXLPARAM)0
+ );
+ }
+} // end of wxWindow::OnPaint
+
bool wxWindowOS2::HandlePaint()
{
- HRGN hRgn = NULLHANDLE;
- wxPaintEvent vEvent;
+ HRGN hRgn;
+ wxPaintEvent vEvent(m_windowId);
HPS hPS;
- RECTL vRect;
+ bool bProcessed;
+
+ // Create empty region
+ // TODO: get HPS somewhere else if possible
+ hPS = ::WinGetPS(GetHwnd());
+ hRgn = ::GpiCreateRegion(hPS, 0, NULL);
- if (::WinQueryUpdateRegion(GetHwnd(), hRgn) == RGN_NULL)
+ if (::WinQueryUpdateRegion(GetHwnd(), hRgn) == RGN_ERROR)
{
wxLogLastError("CreateRectRgn");
return FALSE;
}
- m_updateRegion = wxRegion(hRgn);
+ // Get all the rectangles from the region, convert the individual
+ // rectangles to "the other" coordinate system and reassemble a
+ // region from the rectangles, to be feed into m_updateRegion.
+ //
+ // FIXME: This is a bad hack since OS/2 API specifies that rectangles
+ // passed into GpiSetRegion must not have Bottom > Top,
+ // however, at first sight, it _seems_ to work nonetheless.
+ //
+ RGNRECT vRgnData;
+ PRECTL pUpdateRects = NULL;
+ vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT;
+ if (::GpiQueryRegionRects( hPS // Pres space
+ ,hRgn // Handle of region to query
+ ,NULL // Return all RECTs
+ ,&vRgnData // Will contain number or RECTs in region
+ ,NULL // NULL to return number of RECTs
+ ))
+ {
+ pUpdateRects = new RECTL[vRgnData.crcReturned];
+ vRgnData.crc = vRgnData.crcReturned;
+ vRgnData.ircStart = 1;
+ if (::GpiQueryRegionRects( hPS // Pres space of source
+ ,hRgn // Handle of source region
+ ,NULL // Return all RECTs
+ ,&vRgnData // Operations set to return rects
+ ,pUpdateRects // Will contain the actual RECTS
+ ))
+ {
+ int height;
+ RECT vRect;
+ ::WinQueryWindowRect(GetHwnd(), &vRect);
+ height = vRect.yTop;
+
+ for(size_t i = 0; i < vRgnData.crc; i++)
+ {
+ int rectHeight;
+ rectHeight = pUpdateRects[i].yTop - pUpdateRects[i].yBottom;
+ pUpdateRects[i].yTop = height - pUpdateRects[i].yTop;
+ pUpdateRects[i].yBottom = pUpdateRects[i].yTop + rectHeight;
+ }
+ ::GpiSetRegion(hPS, hRgn, vRgnData.crc, pUpdateRects);
+ delete [] pUpdateRects;
+ }
+ }
+
+ m_updateRegion = wxRegion(hRgn, hPS);
+
vEvent.SetEventObject(this);
- if (!GetEventHandler()->ProcessEvent(vEvent))
+ bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+
+ if (!bProcessed &&
+ IsKindOf(CLASSINFO(wxPanel)) &&
+ GetChildren().GetCount() == 0
+ )
{
+ //
+ // OS/2 needs to process this right here, not by the default proc
+ // Window's default proc correctly paints everything, OS/2 does not.
+ // For decorative panels that typically have no children, we draw
+ // borders.
+ //
HPS hPS;
+ RECTL vRect;
hPS = ::WinBeginPaint( GetHwnd()
,NULLHANDLE
,0L
,NULL
);
-
- ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
-
+ if (::WinIsWindowVisible(GetHWND()))
+ ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
if (m_dwExStyle)
{
- LINEBUNDLE vLineBundle;
+ LINEBUNDLE vLineBundle;
vLineBundle.lColor = 0x00000000; // Black
vLineBundle.usMixMode = FM_OVERPAINT;
,m_dwExStyle
);
}
- ::WinEndPaint(hPS);
}
+ ::WinEndPaint(hPS);
+ bProcessed = TRUE;
}
- return (GetEventHandler()->ProcessEvent(vEvent));
+ else if (!bProcessed &&
+ IsKindOf(CLASSINFO(wxPanel))
+ )
+ {
+ //
+ // Panel with children, usually fills a frame client so no borders.
+ //
+ HPS hPS;
+ RECTL vRect;
+
+ 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
+ );
+
+ if (::WinIsWindowVisible(GetHWND()))
+ ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
+ }
+ ::WinEndPaint(hPS);
+ bProcessed = TRUE;
+ }
+ return bProcessed;
} // end of wxWindowOS2::HandlePaint
bool wxWindowOS2::HandleEraseBkgnd(
)
{
SWP vSwp;
+ bool rc;
::WinQueryWindowPos(GetHwnd(), &vSwp);
if (vSwp.fl & SWP_MINIMIZE)
wxDC vDC;
vDC.m_hPS = (HPS)hDC; // this is really a PS
- vDC.SetWindow(this);
+ vDC.SetWindow((wxWindow*)this);
vDC.BeginDrawing();
wxEraseEvent vEvent(m_windowId, &vDC);
vEvent.SetEventObject(this);
- bool rc = GetEventHandler()->ProcessEvent(vEvent);
+ rc = GetEventHandler()->ProcessEvent(vEvent);
vDC.EndDrawing();
vDC.m_hPS = NULLHANDLE;
{
RECTL vRect;
HPS hPS = rEvent.m_dc->m_hPS;
+ APIRET rc;
+ LONG lColor = m_backgroundColour.GetPixel();
- ::WinQueryWindowRect(GetHwnd(), &vRect);
- ::WinFillRect(hPS, &vRect, m_backgroundColour.GetPixel());
+ rc = ::WinQueryWindowRect(GetHwnd(), &vRect);
+ rc = ::WinFillRect(hPS, &vRect, lColor);
} // end of wxWindowOS2::OnEraseBackground
// ---------------------------------------------------------------------------
, int nY
)
{
- wxMoveEvent vEvent( wxPoint( nX
- ,nY
- )
- ,m_windowId
- );
+ wxMoveEvent vEvent(wxPoint(nX, nY), m_windowId);
vEvent.SetEventObject(this);
return GetEventHandler()->ProcessEvent(vEvent);
, WXUINT WXUNUSED(nFlag)
)
{
- wxSizeEvent vEvent( wxSize( nWidth
- ,nHeight
- )
- ,m_windowId
- );
+ wxSizeEvent vEvent(wxSize(nWidth, nHeight), m_windowId);
vEvent.SetEventObject(this);
return GetEventHandler()->ProcessEvent(vEvent);
PSWP pSwp
)
{
- bool bRc = FALSE;
POINTL vPoint;
switch(pSwp->fl)
, WXHWND hControl
)
{
+#if wxUSE_MENUS_NATIVE
if (wxCurrentPopupMenu)
{
wxMenu* pPopupMenu = wxCurrentPopupMenu;
wxCurrentPopupMenu = NULL;
return pPopupMenu->OS2Command(wCmd, wId);
}
+#endif // wxUSE_MENUS_NATIVE
wxWindow* pWin = FindItem(wId);
}
if (pWin)
- return pWin->OS2Command( wCmd
- ,wId
- );
+ return pWin->OS2Command(wCmd, wId);
+
return FALSE;
} // end of wxWindowOS2::HandleCommand
bool wxWindowOS2::HandleSysCommand(
WXWPARAM wParam
-, WXLPARAM lParam
+, WXLPARAM WXUNUSED(lParam)
)
{
//
// ---------------------------------------------------------------------------
// mouse events
// ---------------------------------------------------------------------------
-
+//TODO!!! check against MSW
void wxWindowOS2::InitMouseEvent(
wxMouseEvent& rEvent
, int nX
, WXUINT uFlags
)
{
+ int nHeight;
+ DoGetSize(0, &nHeight);
rEvent.m_x = nX;
- rEvent.m_y = nY;
- rEvent.m_shiftDown = ((uFlags & VK_SHIFT) != 0);
- rEvent.m_controlDown = ((uFlags & VK_CTRL) != 0);
- rEvent.m_leftDown = ((uFlags & VK_BUTTON1) != 0);
- rEvent.m_middleDown = ((uFlags & VK_BUTTON3) != 0);
- rEvent.m_rightDown = ((uFlags & VK_BUTTON2) != 0);
+ // Convert to wxWidgets standard coordinate system!
+ rEvent.m_y = nHeight - nY;
+ rEvent.m_shiftDown = ((uFlags & KC_SHIFT) != 0);
+ rEvent.m_controlDown = ((uFlags & KC_CTRL) != 0);
+ rEvent.m_altDown = ((uFlags & KC_ALT) != 0);
+ rEvent.m_leftDown = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) &
+ 0x8000) != 0;
+ rEvent.m_middleDown = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) &
+ 0x8000) != 0;
+ rEvent.m_rightDown = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) &
+ 0x8000) != 0;
rEvent.SetTimestamp(s_currentMsg.time);
- rEvent.m_eventObject = this;
+ rEvent.SetEventObject(this);
+ rEvent.SetId(GetId());
#if wxUSE_MOUSEEVENT_HACK
m_lastMouseX = nX;
, WXUINT uFlags
)
{
+ bool bProcessed = FALSE;
+
//
// The mouse events take consecutive IDs from WM_MOUSEFIRST to
- // WM_MOUSELAST, so it's enough to substract WM_MOUSEMOVE == WM_MOUSEFIRST
+ // WM_MOUSELAST, so it's enough to subtract WM_MOUSEMOVE == WM_MOUSEFIRST
// from the message id and take the value in the table to get wxWin event
// id
//
wxEVT_MIDDLE_DCLICK
};
- wxMouseEvent vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]);
+ // Bounds check
+ if ((uMsg >= WM_MOUSEMOVE) && (uMsg <= WM_BUTTON3DBLCLK))
+ {
+ wxMouseEvent vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]);
- InitMouseEvent( vEvent
- ,nX
- ,nY
- ,uFlags
- );
+ InitMouseEvent( vEvent
+ ,nX
+ ,nY
+ ,uFlags
+ );
- return GetEventHandler()->ProcessEvent(vEvent);
+ bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+ if (!bProcessed)
+ {
+ HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR();
+
+ if (hCursor != NULLHANDLE)
+ {
+ ::WinSetPointer(HWND_DESKTOP, hCursor);
+ bProcessed = TRUE;
+ }
+ }
+ }
+ return bProcessed;
} // end of wxWindowOS2::HandleMouseEvent
bool wxWindowOS2::HandleMouseMove(
wxEventType eType
, int nId
, WXLPARAM lParam
+, WXWPARAM wParam
) const
{
wxKeyEvent vEvent(eType);
vEvent.m_controlDown = IsCtrlDown();
vEvent.m_altDown = (HIWORD(lParam) & KC_ALT) == KC_ALT;
- vEvent.m_eventObject = (wxWindow *)this; // const_cast
+ vEvent.SetEventObject((wxWindow *)this); // const_cast
vEvent.m_keyCode = nId;
+ vEvent.m_rawCode = (wxUint32)wParam;
+ vEvent.m_rawFlags = (wxUint32)lParam;
vEvent.SetTimestamp(s_currentMsg.time);
//
// WM_KEYDOWN one
//
bool wxWindowOS2::HandleChar(
- WXWORD wParam
+ WXWPARAM wParam
, WXLPARAM lParam
, bool isASCII
)
bool bCtrlDown = FALSE;
int vId;
+ if (m_bLastKeydownProcessed)
+ {
+ //
+ // The key was handled in the EVT_KEY_DOWN. Handling a key in an
+ // EVT_KEY_DOWN handler is meant, by design, to prevent EVT_CHARs
+ // from happening, so just bail out at this point.
+ //
+ m_bLastKeydownProcessed = FALSE;
+ return TRUE;
+ }
if (isASCII)
{
//
- // If 1 -> 26, translate to CTRL plus a letter.
+ // If 1 -> 26, translate to either special keycode or just set
+ // ctrlDown. IOW, Ctrl-C should result in keycode == 3 and
+ // ControlDown() == TRUE.
//
- vId = wParam;
+ vId = SHORT1FROMMP(lParam);
if ((vId > 0) && (vId < 27))
{
switch (vId)
default:
bCtrlDown = TRUE;
- vId = vId + 96;
+ break;
}
}
}
- else if ( (vId = wxCharCodeOS2ToWX(wParam)) == 0)
+ else // we're called from WM_KEYDOWN
{
- //
- // It's ASCII and will be processed here only when called from
- // WM_CHAR (i.e. when isASCII = TRUE), don't process it now
- //
- vId = -1;
+ vId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam));
+ if (vId == 0)
+ return FALSE;
}
- if (vId != -1)
- {
- wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR
+ wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR
,vId
,lParam
));
- if (bCtrlDown)
- {
- vEvent.m_controlDown = TRUE;
- }
-
- if (GetEventHandler()->ProcessEvent(vEvent))
- return TRUE;
+ if (bCtrlDown)
+ {
+ vEvent.m_controlDown = TRUE;
}
- return FALSE;
+ return (GetEventHandler()->ProcessEvent(vEvent));
}
bool wxWindowOS2::HandleKeyDown(
- WXWORD wParam
+ WXWPARAM wParam
, WXLPARAM lParam
)
{
- int nId = wxCharCodeOS2ToWX(wParam);
+ int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam));
if (!nId)
{
//
// Normal ASCII char
//
- nId = wParam;
+ nId = SHORT1FROMMP(lParam);
}
if (nId != -1)
{
wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_DOWN
,nId
- ,lParam
+ ,(MPARAM)lParam
+ ,(MPARAM)wParam
));
if (GetEventHandler()->ProcessEvent(vEvent))
} // end of wxWindowOS2::HandleKeyDown
bool wxWindowOS2::HandleKeyUp(
- WXWORD wParam
+ WXWPARAM wParam
, WXLPARAM lParam
)
{
- int nId = wxCharCodeOS2ToWX(wParam);
+ int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam));
if (!nId)
{
//
// Normal ASCII char
//
- nId = wParam;
+ nId = CHAR1FROMMP(lParam);
}
if (nId != -1)
{
wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_UP
,nId
- ,lParam
+ ,(MPARAM)lParam
+ ,(MPARAM)wParam
));
if (GetEventHandler()->ProcessEvent(vEvent))
vEvent.SetPosition(wPos);
vEvent.SetOrientation(nOrientation);
- vEvent.m_eventObject = this;
+ vEvent.SetEventObject(this);
switch (wParam)
{
case SB_LINEUP:
- vEvent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+ vEvent.SetEventType(wxEVT_SCROLLWIN_LINEUP);
break;
case SB_LINEDOWN:
- vEvent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+ vEvent.SetEventType(wxEVT_SCROLLWIN_LINEDOWN);
break;
case SB_PAGEUP:
- vEvent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
+ vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEUP);
break;
case SB_PAGEDOWN:
- vEvent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+ vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEDOWN);
break;
case SB_SLIDERPOSITION:
- vEvent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+ vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBRELEASE);
break;
case SB_SLIDERTRACK:
- vEvent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+ vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBTRACK);
break;
default:
return GetEventHandler()->ProcessEvent(vEvent);
} // end of wxWindowOS2::OS2OnScroll
+void wxWindowOS2::MoveChildren(
+ int nDiff
+)
+{
+ //
+ // We want to handle top levels ourself, manually
+ //
+ if (!IsTopLevel() && GetAutoLayout())
+ {
+ Layout();
+ }
+ else
+ {
+ SWP vSwp;
+
+ for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+ node;
+ node = node->GetNext())
+ {
+ wxWindow* pWin = node->GetData();
+
+ ::WinQueryWindowPos( GetHwndOf(pWin)
+ ,&vSwp
+ );
+ // Actually, only move children that already are placed on the
+ // frame, not ones which are still at wxDefaultCoord.
+ if (vSwp.y == wxDefaultCoord)
+ continue;
+ if (pWin->IsKindOf(CLASSINFO(wxControl)))
+ {
+ wxControl* pCtrl;
+
+ //
+ // Must deal with controls that have margins like ENTRYFIELD. The SWP
+ // struct of such a control will have and origin offset from its intended
+ // position by the width of the margins.
+ //
+ pCtrl = wxDynamicCast(pWin, wxControl);
+ vSwp.y -= pCtrl->GetYComp();
+ vSwp.x -= pCtrl->GetXComp();
+ }
+ ::WinSetWindowPos( GetHwndOf(pWin)
+ ,HWND_TOP
+ ,vSwp.x
+ ,vSwp.y - nDiff
+ ,vSwp.cx
+ ,vSwp.cy
+ ,SWP_MOVE
+ );
+ ::WinQueryWindowPos(GetHwndOf(pWin), pWin->GetSwp());
+ if (pWin->IsKindOf(CLASSINFO(wxRadioBox)))
+ {
+ wxRadioBox* pRadioBox;
+
+ pRadioBox = wxDynamicCast(pWin, wxRadioBox);
+ pRadioBox->AdjustButtons( (int)vSwp.x
+ ,(int)vSwp.y - nDiff
+ ,(int)vSwp.cx
+ ,(int)vSwp.cy
+ ,pRadioBox->GetSizeFlags()
+ );
+ }
+ if (pWin->IsKindOf(CLASSINFO(wxSlider)))
+ {
+ wxSlider* pSlider;
+
+ pSlider = wxDynamicCast(pWin, wxSlider);
+ pSlider->AdjustSubControls( (int)vSwp.x
+ ,(int)vSwp.y - nDiff
+ ,(int)vSwp.cx
+ ,(int)vSwp.cy
+ ,(int)pSlider->GetSizeFlags()
+ );
+ }
+ }
+ }
+ Refresh();
+} // end of wxWindowOS2::MoveChildren
+
+//
+// Getting the Y position for a window, like a control, is a real
+// pain. There are three sitatuions we must deal with in determining
+// the OS2 to wxWidgets Y coordinate.
+//
+// 1) The controls are created in a dialog.
+// This is the easiest since a dialog is created with its original
+// size so the standard: Y = ParentHeight - (Y + ControlHeight);
+//
+// 2) The controls are direct children of a frame
+// In this instance the controls are actually children of the Frame's
+// client. During creation the frame's client resizes several times
+// during creation of the status bar and toolbars. The CFrame class
+// will take care of this using its AlterChildPos proc.
+//
+// 3) The controls are children of a panel, which in turn is a child of
+// a frame.
+// The panel may be one of many, in which case the same treatment
+// as 1 applies. It may be the only child, though.
+// This is the nastiest case. A panel is created as the only child of
+// the frame and as such, when a frame has only one child, the child is
+// expanded to fit the entire client area of the frame. Because the
+// controls are created BEFORE this occurs their positions are totally
+// whacked and any call to WinQueryWindowPos will return invalid
+// coordinates. So for this situation we have to compare the size of
+// the panel at control creation time with that of the frame client. If
+// they are the same we can use the standard Y position equation. If
+// not, then we must use the Frame Client's dimensions to position them
+// as that will be the eventual size of the panel after the frame resizes
+// it!
+//
+int wxWindowOS2::GetOS2ParentHeight(
+ wxWindowOS2* pParent
+)
+{
+ //
+ // Case 1
+ //
+ if (pParent->IsKindOf(CLASSINFO(wxDialog)))
+ return(pParent->GetClientSize().y);
+
+ //
+ // Case 2 -- if we are one of the separately built standard Frame
+ // children, like a statusbar, menubar, or toolbar we want to
+ // use the frame, itself, for positioning. Otherwise we are
+ // child window and want to use the Frame's client.
+ //
+ else if (pParent->IsKindOf(CLASSINFO(wxFrame)))
+ {
+ if (IsKindOf(CLASSINFO(wxStatusBar)) ||
+ IsKindOf(CLASSINFO(wxMenuBar)) ||
+ IsKindOf(CLASSINFO(wxToolBar))
+ )
+ {
+ if (IsKindOf(CLASSINFO(wxToolBar)))
+ {
+ wxFrame* pFrame = wxDynamicCast(GetParent(), wxFrame);
+
+ if (pFrame->GetToolBar() == this)
+ return(pParent->GetSize().y);
+ else
+ return(pParent->GetClientSize().y);
+ }
+ else
+ return(pParent->GetSize().y);
+ }
+ else
+ return(pParent->GetClientSize().y);
+ }
+ //
+ // Case -- this is for any window that is the sole child of a Frame.
+ // The grandparent must exist and it must be of type CFrame
+ // and it's height must be different. Otherwise the standard
+ // applies.
+ //
+ else
+ {
+ return(pParent->GetClientSize().y);
+ }
+ return(0L);
+} // end of wxWindowOS2::GetOS2ParentHeight
+
+//
+// OS/2 needs a lot extra manipulation to deal with layouts
+// for canvas windows, particularly scrolled ones.
+//
+wxWindowCreationHook::wxWindowCreationHook(
+ wxWindow* pWinBeingCreated
+)
+{
+ gpWinBeingCreated = pWinBeingCreated;
+} // end of wxWindowCreationHook::wxWindowCreationHook
+
+wxWindowCreationHook::~wxWindowCreationHook()
+{
+ gpWinBeingCreated = NULL;
+} // end of wxWindowCreationHook::~wxWindowCreationHook
+
// ===========================================================================
// global functions
// ===========================================================================
WXHWND hWnd
, int* pX
, int* pY
-,wxFont* pTheFont
+,wxFont* WXUNUSED(pTheFont)
)
{
- // TODO: we'll do this later
+ FONTMETRICS vFM;
+ HPS hPS;
+ BOOL rc;
+
+ hPS =::WinGetPS(hWnd);
+
+ rc = ::GpiQueryFontMetrics(hPS, sizeof(FONTMETRICS), &vFM);
+ if (rc)
+ {
+ if (pX)
+ *pX = vFM.lAveCharWidth;
+ if (pY)
+ *pY = vFM.lEmHeight + vFM.lExternalLeading;
+ }
+ else
+ {
+ if (pX)
+ *pX = 10;
+ if (pY)
+ *pY = 15;
+ }
+ ::WinReleasePS(hPS);
} // end of wxGetCharSize
//
case VK_CTRL: nId = WXK_CONTROL; break;
case VK_PAUSE: nId = WXK_PAUSE; break;
case VK_SPACE: nId = WXK_SPACE; break;
+ case VK_PAGEUP: nId = WXK_PRIOR; break;
+ case VK_PAGEDOWN: nId = WXK_NEXT; break;
case VK_ESC: nId = WXK_ESCAPE; break;
case VK_END: nId = WXK_END; break;
case VK_HOME : nId = WXK_HOME; break;
case VK_PRINTSCRN: nId = WXK_PRINT; break;
case VK_INSERT: nId = WXK_INSERT; break;
case VK_DELETE: nId = WXK_DELETE; break;
+ case VK_CAPSLOCK: nId = WXK_CAPITAL; break;
case VK_F1: nId = WXK_F1; break;
case VK_F2: nId = WXK_F2; break;
case VK_F3: nId = WXK_F3; break;
case VK_F22: nId = WXK_F22; break;
case VK_F23: nId = WXK_F23; break;
case VK_F24: nId = WXK_F24; break;
+ case VK_OEM_1: nId = ';'; break;
+ case VK_OEM_PLUS: nId = '+'; break;
+ case VK_OEM_COMMA: nId = ','; break;
+ case VK_OEM_MINUS: nId = '-'; break;
+ case VK_OEM_PERIOD: nId = '.'; break;
+ case VK_OEM_2: nId = '/'; break;
+ case VK_OEM_3: nId = '~'; break;
+ case VK_OEM_4: nId = '['; break;
+ case VK_OEM_5: nId = '\\'; break;
+ case VK_OEM_6: nId = ']'; break;
+ case VK_OEM_7: nId = '\''; break;
case VK_NUMLOCK: nId = WXK_NUMLOCK; break;
case VK_SCRLLOCK: nId = WXK_SCROLL; break;
default:
case WXK_SHIFT: nKeySym = VK_SHIFT; break;
case WXK_CONTROL: nKeySym = VK_CTRL; break;
case WXK_PAUSE: nKeySym = VK_PAUSE; break;
+ case WXK_PRIOR: nKeySym = VK_PAGEUP; break;
+ case WXK_NEXT : nKeySym = VK_PAGEDOWN; break;
case WXK_END: nKeySym = VK_END; break;
case WXK_HOME : nKeySym = VK_HOME; break;
case WXK_LEFT : nKeySym = VK_LEFT; break;
// Beginning of user defined messages
case 0x1000: return "WM_USER";
- // wxWindows user defined types
+ // wxWidgets user defined types
// listview
// case 0x1000 + 0: return "LVM_GETBKCOLOR";
#endif // __WXDEBUG__
+// Unused?
+#if 0
static void TranslateKbdEventToMouse(
wxWindow* pWin
, int* pX
pWin->ScreenToClient(pX, pY);
} // end of TranslateKbdEventToMouse
+#endif
// Find the wxWindow at the current mouse position, returning the mouse
// position.
wxWindow* wxFindWindowAtPointer(
- wxPoint& rPt
+ wxPoint& WXUNUSED(rPt)
)
{
return wxFindWindowAtPoint(wxGetMousePosition());
return wxPoint(vPt.x, vPt.y);
}
+wxWindowOS2* FindWindowForMouseEvent(
+ wxWindow* pWin
+, short* pnX
+, short* pnY
+)
+{
+ HWND hWnd = GetHwndOf(pWin);
+ HWND hWndUnderMouse;
+ POINTL vPoint;
+ BOOL rcEnabled = FALSE;
+ BOOL rcVisible = FALSE;
+
+ ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+ hWndUnderMouse = ::WinWindowFromPoint(HWND_DESKTOP, &vPoint, TRUE);
+ if (hWndUnderMouse != HWND_DESKTOP)
+ {
+ wxWindow* pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse);
+
+ if (pWinUnderMouse)
+ {
+ wxWindowList::compatibility_iterator current = pWinUnderMouse->GetChildren().GetFirst();
+ wxWindow* pGrandChild = NULL;
+ RECTL vRect;
+ POINTL vPoint2;
+
+ ::WinMapWindowPoints(HWND_DESKTOP, hWndUnderMouse, &vPoint, 1);
+ //
+ // Find a child window mouse might be under
+ //
+ while (current)
+ {
+ wxWindow* pChild = current->GetData();
+
+ vPoint2.x = vPoint.x;
+ vPoint2.y = vPoint.y;
+ ::WinMapWindowPoints(hWndUnderMouse, pChild->GetHWND(), &vPoint2, 1);
+ ::WinQueryWindowRect(pChild->GetHWND(), &vRect);
+ if (::WinPtInRect(vHabmain, &vRect, &vPoint2))
+ {
+ if (pChild->IsTopLevel())
+ {
+ POINTL vPoint3;
+ wxWindowList::compatibility_iterator current2 =pChild->GetChildren().GetFirst();
+
+ while (current2)
+ {
+ wxWindow* pGrandChild = current2->GetData();
+
+ vPoint3.x = vPoint2.x;
+ vPoint3.y = vPoint2.y;
+ ::WinMapWindowPoints( pChild->GetHWND()
+ ,pGrandChild->GetHWND()
+ ,&vPoint3
+ ,1
+ );
+ ::WinQueryWindowRect(pGrandChild->GetHWND(), &vRect);
+ if (::WinPtInRect(vHabmain, &vRect, &vPoint3))
+ {
+ hWndUnderMouse = GetHwndOf(pGrandChild);
+ pWinUnderMouse = pGrandChild;
+ break;
+ }
+ current2 = current2->GetNext();
+ }
+ if (pGrandChild)
+ break;
+ }
+ hWndUnderMouse = GetHwndOf(pChild);
+ pWinUnderMouse = pChild;
+ rcVisible = ::WinIsWindowVisible(hWndUnderMouse);
+ rcEnabled = ::WinIsWindowEnabled(hWndUnderMouse);
+ if (rcVisible && rcEnabled)
+ break;
+ }
+ current = current->GetNext();
+ }
+ }
+ }
+ rcVisible = ::WinIsWindowVisible(hWndUnderMouse);
+ rcEnabled = ::WinIsWindowEnabled(hWndUnderMouse);
+
+
+ //
+ // Check that we have a child window which is susceptible to receive mouse
+ // events: for this it must be shown and enabled
+ //
+ if ( hWndUnderMouse &&
+ hWndUnderMouse != hWnd &&
+ rcVisible && rcEnabled)
+ {
+ wxWindow* pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse);
+
+ if (pWinUnderMouse)
+ {
+ //
+ // Translate the mouse coords to the other window coords
+ //
+ pWin = pWinUnderMouse;
+ }
+ }
+ return pWin;
+} // end of FindWindowForMouseEvent
+
projects / wxWidgets.git / blobdiff