Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for OS/2 wxUniv merge.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-07-06 21:47:52 +00:00
parent 537760597b
commit 0367c1c0e8
11 changed files with 851 additions and 1523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/os2/dcclient.cpp
View File

@@ -218,6 +218,29 @@ wxClientDC::wxClientDC(
InitDC(); InitDC();
} // end of wxClientDC::wxClientDC } // end of wxClientDC::wxClientDC
void wxClientDC::InitDC()
{
wxWindowDC::InitDC();
// in wxUniv build we must manually do some DC adjustments usually
// performed by Windows for us
#ifdef __WXUNIVERSAL__
wxPoint ptOrigin = m_canvas->GetClientAreaOrigin();
if ( ptOrigin.x || ptOrigin.y )
{
// no need to shift DC origin if shift is null
SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
}
// clip the DC to avoid overwriting the non client area
SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize());
#endif // __WXUNIVERSAL__
} // end of wxClientDC::InitDC
wxClientDC::~wxClientDC()
{
} // end of wxClientDC::~wxClientDC
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxPaintDC // wxPaintDC
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

162
src/os2/frame.cpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: frame.cpp // Name: frame.cpp
// Purpose: wxFrame // Purpose: wxFrameOS2
// Author: David Webster // Author: David Webster
// Modified by: // Modified by:
// Created: 10/27/99 // Created: 10/27/99
@@ -63,12 +63,16 @@ extern void wxAssociateWinWithHandle( HWND hWnd
// event tables // event tables
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) BEGIN_EVENT_TABLE(wxFrameOS2, wxFrameBase)
EVT_ACTIVATE(wxFrame::OnActivate) EVT_ACTIVATE(wxFrameOS2::OnActivate)
EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) EVT_SYS_COLOUR_CHANGED(wxFrameOS2::OnSysColourChanged)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxFrameOS2, wxWindow)
#ifndef __WXUNIVERSAL__
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW)
#endif
// ============================================================================ // ============================================================================
// implementation // implementation
@@ -80,9 +84,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
#if wxUSE_NATIVE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR
bool wxFrame::m_bUseNativeStatusBar = TRUE; bool wxFrameOS2::m_bUseNativeStatusBar = TRUE;
#else #else
bool wxFrame::m_bUseNativeStatusBar = FALSE; bool wxFrameOS2::m_bUseNativeStatusBar = FALSE;
#endif #endif
#endif //wxUSE_STATUSBAR #endif //wxUSE_STATUSBAR
@@ -91,7 +95,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
// creation/destruction // creation/destruction
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxFrame::Init() void wxFrameOS2::Init()
{ {
m_bIconized = FALSE; m_bIconized = FALSE;
@@ -125,9 +129,9 @@ void wxFrame::Init()
memset(&m_vSwpVScroll, 0, sizeof(SWP)); memset(&m_vSwpVScroll, 0, sizeof(SWP));
memset(&m_vSwpStatusBar, 0, sizeof(SWP)); memset(&m_vSwpStatusBar, 0, sizeof(SWP));
memset(&m_vSwpToolBar, 0, sizeof(SWP)); memset(&m_vSwpToolBar, 0, sizeof(SWP));
} // end of wxFrame::Init } // end of wxFrameOS2::Init
bool wxFrame::Create( bool wxFrameOS2::Create(
wxWindow* pParent wxWindow* pParent
, wxWindowID vId , wxWindowID vId
, const wxString& rsTitle , const wxString& rsTitle
@@ -187,9 +191,9 @@ bool wxFrame::Create(
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
} }
return(bOk); return(bOk);
} // end of wxFrame::Create } // end of wxFrameOS2::Create
wxFrame::~wxFrame() wxFrameOS2::~wxFrameOS2()
{ {
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
@@ -231,12 +235,12 @@ wxFrame::~wxFrame()
); );
} }
} }
} // end of wxFrame::~wxFrame } // end of wxFrameOS2::~wxFrame
// //
// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
// //
void wxFrame::DoGetClientSize( void wxFrameOS2::DoGetClientSize(
int* pX int* pX
, int* pY , int* pY
) const ) const
@@ -254,13 +258,13 @@ void wxFrame::DoGetClientSize(
*pX = vRect.xRight - vRect.xLeft; *pX = vRect.xRight - vRect.xLeft;
if (pY) if (pY)
*pY = vRect.yTop - vRect.yBottom; *pY = vRect.yTop - vRect.yBottom;
} // end of wxFrame::DoGetClientSize } // end of wxFrameOS2::DoGetClientSize
// //
// Set the client size (i.e. leave the calculation of borders etc. // Set the client size (i.e. leave the calculation of borders etc.
// to wxWindows) // to wxWindows)
// //
void wxFrame::DoSetClientSize( void wxFrameOS2::DoSetClientSize(
int nWidth int nWidth
, int nHeight , int nHeight
) )
@@ -318,9 +322,9 @@ void wxFrame::DoSetClientSize(
); );
vEvent.SetEventObject(this); vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent); GetEventHandler()->ProcessEvent(vEvent);
} // end of wxFrame::DoSetClientSize } // end of wxFrameOS2::DoSetClientSize
void wxFrame::DoGetSize( void wxFrameOS2::DoGetSize(
int* pWidth int* pWidth
, int* pHeight , int* pHeight
) const ) const
@@ -330,9 +334,9 @@ void wxFrame::DoGetSize(
::WinQueryWindowRect(m_hFrame, &vRect); ::WinQueryWindowRect(m_hFrame, &vRect);
*pWidth = vRect.xRight - vRect.xLeft; *pWidth = vRect.xRight - vRect.xLeft;
*pHeight = vRect.yTop - vRect.yBottom; *pHeight = vRect.yTop - vRect.yBottom;
} // end of wxFrame::DoGetSize } // end of wxFrameOS2::DoGetSize
void wxFrame::DoGetPosition( void wxFrameOS2::DoGetPosition(
int* pX int* pX
, int* pY , int* pY
) const ) const
@@ -344,21 +348,21 @@ void wxFrame::DoGetPosition(
*pX = vRect.xRight - vRect.xLeft; *pX = vRect.xRight - vRect.xLeft;
*pY = vRect.yTop - vRect.yBottom; *pY = vRect.yTop - vRect.yBottom;
} // end of wxFrame::DoGetPosition } // end of wxFrameOS2::DoGetPosition
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// variations around ::ShowWindow() // variations around ::ShowWindow()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxFrame::DoShowWindow( void wxFrameOS2::DoShowWindow(
int bShowCmd int bShowCmd
) )
{ {
::WinShowWindow(m_hFrame, (BOOL)bShowCmd); ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);
m_bIconized = bShowCmd == SWP_MINIMIZE; m_bIconized = bShowCmd == SWP_MINIMIZE;
} // end of wxFrame::DoShowWindow } // end of wxFrameOS2::DoShowWindow
bool wxFrame::Show( bool wxFrameOS2::Show(
bool bShow bool bShow
) )
{ {
@@ -401,27 +405,27 @@ bool wxFrame::Show(
} }
} }
return TRUE; return TRUE;
} // end of wxFrame::Show } // end of wxFrameOS2::Show
void wxFrame::Iconize( void wxFrameOS2::Iconize(
bool bIconize bool bIconize
) )
{ {
DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE); DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
} // end of wxFrame::Iconize } // end of wxFrameOS2::Iconize
void wxFrame::Maximize( void wxFrameOS2::Maximize(
bool bMaximize) bool bMaximize)
{ {
DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE); DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE);
} // end of wxFrame::Maximize } // end of wxFrameOS2::Maximize
void wxFrame::Restore() void wxFrameOS2::Restore()
{ {
DoShowWindow(SWP_RESTORE); DoShowWindow(SWP_RESTORE);
} // end of wxFrame::Restore } // end of wxFrameOS2::Restore
bool wxFrame::IsIconized() const bool wxFrameOS2::IsIconized() const
{ {
SWP vSwp; SWP vSwp;
@@ -432,19 +436,19 @@ bool wxFrame::IsIconized() const
else else
((wxFrame*)this)->m_bIconized = FALSE; ((wxFrame*)this)->m_bIconized = FALSE;
return m_bIconized; return m_bIconized;
} // end of wxFrame::IsIconized } // end of wxFrameOS2::IsIconized
// Is it maximized? // Is it maximized?
bool wxFrame::IsMaximized() const bool wxFrameOS2::IsMaximized() const
{ {
SWP vSwp; SWP vSwp;
bool bIconic; bool bIconic;
::WinQueryWindowPos(m_hFrame, &vSwp); ::WinQueryWindowPos(m_hFrame, &vSwp);
return (vSwp.fl & SWP_MAXIMIZE); return (vSwp.fl & SWP_MAXIMIZE);
} // end of wxFrame::IsMaximized } // end of wxFrameOS2::IsMaximized
void wxFrame::SetIcon( void wxFrameOS2::SetIcon(
const wxIcon& rIcon const wxIcon& rIcon
) )
{ {
@@ -463,10 +467,10 @@ void wxFrame::SetIcon(
,(MPARAM)0 ,(MPARAM)0
); );
} }
} // end of wxFrame::SetIcon } // end of wxFrameOS2::SetIcon
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
wxStatusBar* wxFrame::OnCreateStatusBar( wxStatusBar* wxFrameOS2::OnCreateStatusBar(
int nNumber int nNumber
, long lulStyle , long lulStyle
, wxWindowID vId , wxWindowID vId
@@ -501,9 +505,9 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
return pStatusBar; return pStatusBar;
} // end of wxFrame::OnCreateStatusBar } // end of wxFrameOS2::OnCreateStatusBar
void wxFrame::PositionStatusBar() void wxFrameOS2::PositionStatusBar()
{ {
SWP vSwp; SWP vSwp;
ERRORID vError; ERRORID vError;
@@ -548,19 +552,19 @@ void wxFrame::PositionStatusBar()
return; return;
} }
} }
} // end of wxFrame::PositionStatusBar } // end of wxFrameOS2::PositionStatusBar
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
void wxFrame::DetachMenuBar() void wxFrameOS2::DetachMenuBar()
{ {
if (m_frameMenuBar) if (m_frameMenuBar)
{ {
m_frameMenuBar->Detach(); m_frameMenuBar->Detach();
m_frameMenuBar = NULL; m_frameMenuBar = NULL;
} }
} // end of wxFrame::DetachMenuBar } // end of wxFrameOS2::DetachMenuBar
void wxFrame::SetMenuBar( void wxFrameOS2::SetMenuBar(
wxMenuBar* pMenuBar wxMenuBar* pMenuBar
) )
{ {
@@ -609,11 +613,11 @@ void wxFrame::SetMenuBar(
} }
InternalSetMenuBar(); InternalSetMenuBar();
m_frameMenuBar = pMenuBar; m_frameMenuBar = pMenuBar;
pMenuBar->Attach(this); pMenuBar->Attach((wxFrame*)this);
} }
} // end of wxFrame::SetMenuBar } // end of wxFrameOS2::SetMenuBar
void wxFrame::InternalSetMenuBar() void wxFrameOS2::InternalSetMenuBar()
{ {
ERRORID vError; ERRORID vError;
wxString sError; wxString sError;
@@ -634,12 +638,12 @@ void wxFrame::InternalSetMenuBar()
wxLogError("Error setting parent for submenu. Error: %s\n", sError); wxLogError("Error setting parent for submenu. Error: %s\n", sError);
} }
::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
} // end of wxFrame::InternalSetMenuBar } // end of wxFrameOS2::InternalSetMenuBar
// //
// Responds to colour changes, and passes event on to children // Responds to colour changes, and passes event on to children
// //
void wxFrame::OnSysColourChanged( void wxFrameOS2::OnSysColourChanged(
wxSysColourChangedEvent& rEvent wxSysColourChangedEvent& rEvent
) )
{ {
@@ -660,10 +664,10 @@ void wxFrame::OnSysColourChanged(
// Propagate the event to the non-top-level children // Propagate the event to the non-top-level children
// //
wxWindow::OnSysColourChanged(rEvent); wxWindow::OnSysColourChanged(rEvent);
} // end of wxFrame::OnSysColourChanged } // end of wxFrameOS2::OnSysColourChanged
// Pass TRUE to show full screen, FALSE to restore. // Pass TRUE to show full screen, FALSE to restore.
bool wxFrame::ShowFullScreen( bool wxFrameOS2::ShowFullScreen(
bool bShow bool bShow
, long lStyle , long lStyle
) )
@@ -850,12 +854,12 @@ bool wxFrame::ShowFullScreen(
); );
return TRUE; return TRUE;
} }
} // end of wxFrame::ShowFullScreen } // end of wxFrameOS2::ShowFullScreen
// //
// Frame window // Frame window
// //
bool wxFrame::OS2Create( bool wxFrameOS2::OS2Create(
int nId int nId
, wxWindow* pParent , wxWindow* pParent
, const wxChar* zWclass , const wxChar* zWclass
@@ -1044,13 +1048,13 @@ bool wxFrame::OS2Create(
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} // end of wxFrame::OS2Create } // end of wxFrameOS2::OS2Create
// //
// Default activation behaviour - set the focus for the first child // Default activation behaviour - set the focus for the first child
// subwindow found. // subwindow found.
// //
void wxFrame::OnActivate( void wxFrameOS2::OnActivate(
wxActivateEvent& rEvent wxActivateEvent& rEvent
) )
{ {
@@ -1101,7 +1105,7 @@ void wxFrame::OnActivate(
} }
} }
} }
} // end of wxFrame::OnActivate } // end of wxFrameOS2::OnActivate
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxFrame size management: we exclude the areas taken by menu/status/toolbars // wxFrame size management: we exclude the areas taken by menu/status/toolbars
@@ -1110,7 +1114,7 @@ void wxFrame::OnActivate(
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Checks if there is a toolbar, and returns the first free client position // Checks if there is a toolbar, and returns the first free client position
wxPoint wxFrame::GetClientAreaOrigin() const wxPoint wxFrameOS2::GetClientAreaOrigin() const
{ {
wxPoint vPoint(0, 0); wxPoint vPoint(0, 0);
@@ -1136,7 +1140,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
} }
#endif //wxUSE_TOOLBAR #endif //wxUSE_TOOLBAR
return vPoint; return vPoint;
} // end of wxFrame::GetClientAreaOrigin } // end of wxFrameOS2::GetClientAreaOrigin
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// tool/status bar stuff // tool/status bar stuff
@@ -1144,7 +1148,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
wxToolBar* wxFrame::CreateToolBar( wxToolBar* wxFrameOS2::CreateToolBar(
long lStyle long lStyle
, wxWindowID vId , wxWindowID vId
, const wxString& rName , const wxString& rName
@@ -1158,9 +1162,9 @@ wxToolBar* wxFrame::CreateToolBar(
PositionToolBar(); PositionToolBar();
} }
return m_frameToolBar; return m_frameToolBar;
} // end of wxFrame::CreateToolBar } // end of wxFrameOS2::CreateToolBar
void wxFrame::PositionToolBar() void wxFrameOS2::PositionToolBar()
{ {
HWND hWndClient; HWND hWndClient;
RECTL vRect; RECTL vRect;
@@ -1209,7 +1213,7 @@ void wxFrame::PositionToolBar()
,wxSIZE_NO_ADJUSTMENTS ,wxSIZE_NO_ADJUSTMENTS
); );
} }
} // end of wxFrame::PositionToolBar } // end of wxFrameOS2::PositionToolBar
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1221,7 +1225,7 @@ void wxFrame::PositionToolBar()
// Windows behaviour where child frames float independently of the parent one // Windows behaviour where child frames float independently of the parent one
// on the desktop, but are iconized/restored with it // on the desktop, but are iconized/restored with it
// //
void wxFrame::IconizeChildFrames( void wxFrameOS2::IconizeChildFrames(
bool bIconize bool bIconize
) )
{ {
@@ -1236,7 +1240,7 @@ void wxFrame::IconizeChildFrames(
((wxFrame *)pWin)->Iconize(bIconize); ((wxFrame *)pWin)->Iconize(bIconize);
} }
} }
} // end of wxFrame::IconizeChildFrames } // end of wxFrameOS2::IconizeChildFrames
// =========================================================================== // ===========================================================================
// message processing // message processing
@@ -1245,7 +1249,7 @@ void wxFrame::IconizeChildFrames(
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// preprocessing // preprocessing
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
bool wxFrame::OS2TranslateMessage( bool wxFrameOS2::OS2TranslateMessage(
WXMSG* pMsg WXMSG* pMsg
) )
{ {
@@ -1263,12 +1267,12 @@ bool wxFrame::OS2TranslateMessage(
#else #else
return FALSE; return FALSE;
#endif //wxUSE_ACCEL #endif //wxUSE_ACCEL
} // end of wxFrame::OS2TranslateMessage } // end of wxFrameOS2::OS2TranslateMessage
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// our private (non virtual) message handlers // our private (non virtual) message handlers
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
bool wxFrame::HandlePaint() bool wxFrameOS2::HandlePaint()
{ {
RECTL vRect; RECTL vRect;
@@ -1326,9 +1330,9 @@ bool wxFrame::HandlePaint()
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} // end of wxFrame::HandlePaint } // end of wxFrameOS2::HandlePaint
bool wxFrame::HandleSize( bool wxFrameOS2::HandleSize(
int nX int nX
, int nY , int nY
, WXUINT nId , WXUINT nId
@@ -1404,9 +1408,9 @@ bool wxFrame::HandleSize(
bProcessed = GetEventHandler()->ProcessEvent(vEvent); bProcessed = GetEventHandler()->ProcessEvent(vEvent);
} }
return bProcessed; return bProcessed;
} // end of wxFrame::HandleSize } // end of wxFrameOS2::HandleSize
bool wxFrame::HandleCommand( bool wxFrameOS2::HandleCommand(
WXWORD nId WXWORD nId
, WXWORD nCmd , WXWORD nCmd
, WXHWND hControl , WXHWND hControl
@@ -1447,9 +1451,9 @@ bool wxFrame::HandleCommand(
} }
} }
return FALSE; return FALSE;
} // end of wxFrame::HandleCommand } // end of wxFrameOS2::HandleCommand
bool wxFrame::HandleMenuSelect( bool wxFrameOS2::HandleMenuSelect(
WXWORD nItem WXWORD nItem
, WXWORD nFlags , WXWORD nFlags
, WXHMENU hMenu , WXHMENU hMenu
@@ -1471,7 +1475,7 @@ bool wxFrame::HandleMenuSelect(
} }
} }
return TRUE; return TRUE;
} // end of wxFrame::HandleMenuSelect } // end of wxFrameOS2::HandleMenuSelect
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Main Frame window proc // Main Frame window proc
@@ -1607,7 +1611,7 @@ MRESULT EXPENTRY wxFrameWndProc(
return rc; return rc;
} // end of wxFrameWndProc } // end of wxFrameWndProc
MRESULT wxFrame::OS2WindowProc( MRESULT wxFrameOS2::OS2WindowProc(
WXUINT uMessage WXUINT uMessage
, WXWPARAM wParam , WXWPARAM wParam
, WXLPARAM lParam , WXLPARAM lParam
@@ -1717,14 +1721,14 @@ MRESULT wxFrame::OS2WindowProc(
,lParam ,lParam
); );
return (MRESULT)mRc; return (MRESULT)mRc;
} // wxFrame::OS2WindowProc } // wxFrameOS2::OS2WindowProc
void wxFrame::SetClient(WXHWND c_Hwnd) void wxFrameOS2::SetClient(WXHWND c_Hwnd)
{ {
// Duh...nothing to do under OS/2 // Duh...nothing to do under OS/2
} }
void wxFrame::SetClient( void wxFrameOS2::SetClient(
wxWindow* pWindow wxWindow* pWindow
) )
{ {
@@ -1774,7 +1778,7 @@ void wxFrame::SetClient(
} }
} }
wxWindow* wxFrame::GetClient() wxWindow* wxFrameOS2::GetClient()
{ {
return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT)); return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));
} }

4
src/os2/listbox.cpp
View File

@@ -502,9 +502,9 @@ void wxListBox::SetString(int N, const wxString& s)
void *oldData = NULL; void *oldData = NULL;
wxClientData *oldObjData = NULL; wxClientData *oldObjData = NULL;
if ( m_clientDataItemsType == ClientData_Void ) if ( m_clientDataItemsType == wxClientData_Void )
oldData = GetClientData(N); oldData = GetClientData(N);
else if ( m_clientDataItemsType == ClientData_Object ) else if ( m_clientDataItemsType == wxClientData_Object )
oldObjData = GetClientObject(N); oldObjData = GetClientObject(N);
// TODO: // TODO:
/* /*

46
src/os2/makefile.va
View File

@@ -124,7 +124,8 @@ GENERICOBJS= \
..\generic\$D\propform.obj \ ..\generic\$D\propform.obj \
..\generic\$D\proplist.obj \ ..\generic\$D\proplist.obj \
..\generic\$D\sashwin.obj \ ..\generic\$D\sashwin.obj \
..\generic\$D\scrolwin.obj \ ..\generic\$D\scrlwing.obj \
..\generic\$D\spinctlg.obj \
..\generic\$D\splitter.obj \ ..\generic\$D\splitter.obj \
..\generic\$D\statusbr.obj \ ..\generic\$D\statusbr.obj \
..\generic\$D\tabg.obj \ ..\generic\$D\tabg.obj \
@@ -169,7 +170,8 @@ GENLIBOBJS= \
propform.obj \ propform.obj \
proplist.obj \ proplist.obj \
sashwin.obj \ sashwin.obj \
scrolwin.obj \ scrlwing.obj \
spinctlg.obj \
splitter.obj \ splitter.obj \
statusbr.obj \ statusbr.obj \
tabg.obj \ tabg.obj \
@@ -192,6 +194,7 @@ COMMONOBJS = \
..\common\$D\clipcmn.obj \ ..\common\$D\clipcmn.obj \
..\common\$D\cmdline.obj \ ..\common\$D\cmdline.obj \
..\common\$D\cmndata.obj \ ..\common\$D\cmndata.obj \
..\common\$D\cmdproc.obj \
..\common\$D\config.obj \ ..\common\$D\config.obj \
..\common\$D\cshelp.obj \ ..\common\$D\cshelp.obj \
..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlcmn.obj \
@@ -230,6 +233,7 @@ COMMONOBJS = \
..\common\$D\fs_mem.obj \ ..\common\$D\fs_mem.obj \
..\common\$D\fs_zip.obj \ ..\common\$D\fs_zip.obj \
..\common\$D\ftp.obj \ ..\common\$D\ftp.obj \
..\common\$D\gaugecmn.obj \
..\common\$D\gdicmn.obj \ ..\common\$D\gdicmn.obj \
..\common\$D\geometry.obj \ ..\common\$D\geometry.obj \
..\common\$D\gifdecod.obj \ ..\common\$D\gifdecod.obj \
@@ -259,6 +263,7 @@ COMMONOBJS = \
..\common\$D\mimecmn.obj \ ..\common\$D\mimecmn.obj \
..\common\$D\module.obj \ ..\common\$D\module.obj \
..\common\$D\mstream.obj \ ..\common\$D\mstream.obj \
..\common\$D\nbkbase.obj \
..\common\$D\object.obj \ ..\common\$D\object.obj \
..\common\$D\objstrm.obj \ ..\common\$D\objstrm.obj \
!if "$(WXMAKINGDLL)" != "1" !if "$(WXMAKINGDLL)" != "1"
@@ -266,10 +271,12 @@ COMMONOBJS = \
..\common\$D\odbc.obj \ ..\common\$D\odbc.obj \
!endif !endif
..\common\$D\paper.obj \ ..\common\$D\paper.obj \
..\common\$D\popupcmn.obj \
..\common\$D\prntbase.obj \ ..\common\$D\prntbase.obj \
..\common\$D\process.obj \ ..\common\$D\process.obj \
..\common\$D\protocol.obj \ ..\common\$D\protocol.obj \
..\common\$D\quantize.obj \ ..\common\$D\quantize.obj \
..\common\$D\radiocmn.obj \
..\common\$D\resource.obj \ ..\common\$D\resource.obj \
..\common\$D\sckaddr.obj \ ..\common\$D\sckaddr.obj \
..\common\$D\sckfile.obj \ ..\common\$D\sckfile.obj \
@@ -310,6 +317,7 @@ COMLIBOBJS1 = \
clipcmn.obj \ clipcmn.obj \
cmdline.obj \ cmdline.obj \
cmndata.obj \ cmndata.obj \
cmdproc.obj \
config.obj \ config.obj \
cshelp.obj \ cshelp.obj \
ctrlcmn.obj \ ctrlcmn.obj \
@@ -345,12 +353,13 @@ COMLIBOBJS1 = \
fs_mem.obj \ fs_mem.obj \
fs_zip.obj \ fs_zip.obj \
ftp.obj \ ftp.obj \
gaugecmn.obj \
gdicmn.obj \ gdicmn.obj \
geometry.obj \ geometry.obj
gifdecod.obj \
hash.obj
COMLIBOBJS2 = \ COMLIBOBJS2 = \
gifdecod.obj \
hash.obj \
helpbase.obj \ helpbase.obj \
http.obj \ http.obj \
imagall.obj \ imagall.obj \
@@ -376,25 +385,28 @@ COMLIBOBJS2 = \
mimecmn.obj \ mimecmn.obj \
module.obj \ module.obj \
mstream.obj \ mstream.obj \
nbkbase.obj \
object.obj \ object.obj \
objstrm.obj \ objstrm.obj \
odbc.obj \ odbc.obj \
paper.obj \ paper.obj \
popupcmn.obj \
prntbase.obj \ prntbase.obj \
process.obj \ process.obj \
protocol.obj \ protocol.obj \
quantize.obj \ quantize.obj \
radiocmn.obj \
resource.obj \ resource.obj \
sckaddr.obj \ sckaddr.obj \
sckfile.obj \ sckfile.obj \
sckipc.obj \ sckipc.obj
COMLIBOBJS3 = \
sckstrm.obj \ sckstrm.obj \
serbase.obj \ serbase.obj \
sizer.obj \ sizer.obj \
socket.obj \ socket.obj \
strconv.obj strconv.obj \
COMLIBOBJS3 = \
stream.obj \ stream.obj \
string.obj \ string.obj \
tbarbase.obj \ tbarbase.obj \
@@ -654,6 +666,7 @@ $(COMLIBOBJS1):
copy ..\common\$D\clipcmn.obj copy ..\common\$D\clipcmn.obj
copy ..\common\$D\cmdline.obj copy ..\common\$D\cmdline.obj
copy ..\common\$D\cmndata.obj copy ..\common\$D\cmndata.obj
copy ..\common\$D\cmdproc.obj
copy ..\common\$D\config.obj copy ..\common\$D\config.obj
copy ..\common\$D\cshelp.obj copy ..\common\$D\cshelp.obj
copy ..\common\$D\ctrlcmn.obj copy ..\common\$D\ctrlcmn.obj
@@ -689,12 +702,13 @@ $(COMLIBOBJS1):
copy ..\common\$D\fs_mem.obj copy ..\common\$D\fs_mem.obj
copy ..\common\$D\fs_zip.obj copy ..\common\$D\fs_zip.obj
copy ..\common\$D\ftp.obj copy ..\common\$D\ftp.obj
copy ..\common\$D\gaugecmn.obj
copy ..\common\$D\gdicmn.obj copy ..\common\$D\gdicmn.obj
copy ..\common\$D\geometry.obj copy ..\common\$D\geometry.obj
copy ..\common\$D\gifdecod.obj
copy ..\common\$D\hash.obj
$(COMLIBOBJS2): $(COMLIBOBJS2):
copy ..\common\$D\gifdecod.obj
copy ..\common\$D\hash.obj
copy ..\common\$D\helpbase.obj copy ..\common\$D\helpbase.obj
copy ..\common\$D\http.obj copy ..\common\$D\http.obj
copy ..\common\$D\imagall.obj copy ..\common\$D\imagall.obj
@@ -720,25 +734,28 @@ $(COMLIBOBJS2):
copy ..\common\$D\mimecmn.obj copy ..\common\$D\mimecmn.obj
copy ..\common\$D\module.obj copy ..\common\$D\module.obj
copy ..\common\$D\mstream.obj copy ..\common\$D\mstream.obj
copy ..\common\$D\nbkbase.obj
copy ..\common\$D\object.obj copy ..\common\$D\object.obj
copy ..\common\$D\objstrm.obj copy ..\common\$D\objstrm.obj
copy ..\common\$D\odbc.obj copy ..\common\$D\odbc.obj
copy ..\common\$D\paper.obj copy ..\common\$D\paper.obj
copy ..\common\$D\popupcmn.obj
copy ..\common\$D\prntbase.obj copy ..\common\$D\prntbase.obj
copy ..\common\$D\process.obj copy ..\common\$D\process.obj
copy ..\common\$D\protocol.obj copy ..\common\$D\protocol.obj
copy ..\common\$D\quantize.obj copy ..\common\$D\quantize.obj
copy ..\common\$D\radiocmn.obj
copy ..\common\$D\resource.obj copy ..\common\$D\resource.obj
copy ..\common\$D\sckaddr.obj copy ..\common\$D\sckaddr.obj
copy ..\common\$D\sckfile.obj copy ..\common\$D\sckfile.obj
copy ..\common\$D\sckipc.obj copy ..\common\$D\sckipc.obj
$(COMLIBOBJS3):
copy ..\common\$D\sckstrm.obj copy ..\common\$D\sckstrm.obj
copy ..\common\$D\serbase.obj copy ..\common\$D\serbase.obj
copy ..\common\$D\sizer.obj copy ..\common\$D\sizer.obj
copy ..\common\$D\socket.obj copy ..\common\$D\socket.obj
copy ..\common\$D\strconv.obj copy ..\common\$D\strconv.obj
$(COMLIBOBJS3):
copy ..\common\$D\stream.obj copy ..\common\$D\stream.obj
copy ..\common\$D\string.obj copy ..\common\$D\string.obj
copy ..\common\$D\tbarbase.obj copy ..\common\$D\tbarbase.obj
@@ -794,7 +811,8 @@ $(GENLIBOBJS):
copy ..\generic\$D\propform.obj copy ..\generic\$D\propform.obj
copy ..\generic\$D\proplist.obj copy ..\generic\$D\proplist.obj
copy ..\generic\$D\sashwin.obj copy ..\generic\$D\sashwin.obj
copy ..\generic\$D\scrolwin.obj copy ..\generic\$D\scrlwing.obj
copy ..\generic\$D\spinctlg.obj
copy ..\generic\$D\splitter.obj copy ..\generic\$D\splitter.obj
copy ..\generic\$D\statusbr.obj copy ..\generic\$D\statusbr.obj
copy ..\generic\$D\tabg.obj copy ..\generic\$D\tabg.obj

66
src/os2/menu.cpp
View File

@@ -559,73 +559,21 @@ bool wxMenu::OS2Command(
if (vId != (WXWORD)idMenuTitle) if (vId != (WXWORD)idMenuTitle)
{ {
wxCommandEvent vEvent(wxEVT_COMMAND_MENU_SELECTED); SendEvent( vId
,(int)::WinSendMsg( GetHmenu()
vEvent.SetEventObject(this); ,MM_QUERYITEMATTR
vEvent.SetId(vId); ,(MPARAM)vId
vEvent.SetInt(vId); ,(MPARAM)MIA_CHECKED
ProcessCommand(vEvent); )
);
} }
return TRUE; return TRUE;
} // end of wxMenu::OS2Command } // end of wxMenu::OS2Command
bool wxMenu::ProcessCommand(
wxCommandEvent& rEvent
)
{
bool bProcessed = FALSE;
#if wxUSE_MENU_CALLBACK
//
// Try a callback
//
if (m_callback)
{
(void)(*(m_callback))(*this, rEvent);
bProcessed = TRUE;
}
#endif // wxUSE_MENU_CALLBACK
//
// Try the menu's event handler
//
if (!bProcessed && GetEventHandler())
{
bProcessed = GetEventHandler()->ProcessEvent(rEvent);
}
//
// Try the window the menu was popped up from (and up through the
// hierarchy)
wxWindow* pWin = GetInvokingWindow();
if (!bProcessed && pWin)
bProcessed = pWin->GetEventHandler()->ProcessEvent(rEvent);
return bProcessed;
} // end of wxMenu::ProcessCommand
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// other // other
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
void wxMenu::Attach(
wxMenuBar* pMenubar
)
{
//
// Menu can be in at most one menubar because otherwise they would both
// delete the menu pointer
//
wxASSERT_MSG(!m_menuBar, wxT("menu belongs to 2 menubars, expect a crash"));
m_menuBar = pMenubar;
} // end of
void wxMenu::Detach()
{
wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") );
m_menuBar = NULL;
} // end of wxMenu::Detach
wxWindow* wxMenu::GetWindow() const wxWindow* wxMenu::GetWindow() const
{ {
if (m_invokingWindow != NULL) if (m_invokingWindow != NULL)

14
src/os2/menuitem.cpp
View File

@@ -71,7 +71,7 @@ static wxString TextToLabel(const wxString& rTitle)
pc++; pc++;
Title << wxT('&'); Title << wxT('&');
} }
else else
Title << wxT('~'); Title << wxT('~');
} }
// else if (*pc == wxT('/')) // else if (*pc == wxT('/'))
@@ -208,18 +208,6 @@ wxString wxMenuItemBase::GetLabelFromText(
return label; return label;
} }
// accelerators
// ------------
#if wxUSE_ACCEL
wxAcceleratorEntry *wxMenuItem::GetAccel() const
{
return wxGetAccelFromString(GetText());
}
#endif // wxUSE_ACCEL
// change item state // change item state
// ----------------- // -----------------

19
src/os2/notebook.cpp
View File

@@ -248,6 +248,25 @@ void wxNotebook::SetTabSize(const wxSize& sz)
// wxNotebook operations // wxNotebook operations
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxNotebook::SetPageSize(const wxSize& size)
{
// transform the page size into the notebook size
RECT rc;
rc.xLeft = rc.yTop = 0;
rc.xRight = size.x;
rc.yBottom = size.y;
// TabCtrl_AdjustRect(GetHwnd(), TRUE, &rc);
// and now set it
SetSize(rc.xRight - rc.xLeft, rc.yBottom - rc.yTop);
}
void wxNotebook::SetPadding(const wxSize& padding)
{
// TabCtrl_SetPadding(GetHwnd(), padding.x, padding.y);
}
// remove one page from the notebook // remove one page from the notebook
bool wxNotebook::DeletePage(int nPage) bool wxNotebook::DeletePage(int nPage)
{ {

23
src/os2/radiobox.cpp
View File

@@ -51,6 +51,21 @@ static s_wndprocRadioBtn = NULL;
// wxRadioBox // wxRadioBox
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
int wxRadioBox::GetCount() const
{
return m_noItems;
}
int wxRadioBox::GetColumnCount() const
{
return GetNumHor();
}
int wxRadioBox::GetRowCount() const
{
return GetNumVer();
}
int wxRadioBox::GetNumVer() const int wxRadioBox::GetNumVer() const
{ {
if ( m_windowStyle & wxRA_SPECIFY_ROWS ) if ( m_windowStyle & wxRA_SPECIFY_ROWS )
@@ -281,6 +296,14 @@ wxRadioBox::~wxRadioBox()
} }
void wxRadioBox::SetString(int item, const wxString& label)
{
wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") );
m_radioWidth[item] = m_radioHeight[item] = -1;
::WinSetWindowText((HWND)m_radioButtons[item], label.c_str());
}
wxString wxRadioBox::GetLabel(int item) const wxString wxRadioBox::GetLabel(int item) const
{ {
wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") ); wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") );

5
src/os2/radiobut.cpp
View File

@@ -26,7 +26,6 @@
#include "wx/os2/private.h" #include "wx/os2/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
bool wxRadioButton::OS2Command(WXUINT param, WXWORD id) bool wxRadioButton::OS2Command(WXUINT param, WXWORD id)
{ {
@@ -148,6 +147,9 @@ void wxRadioButton::Command (wxCommandEvent & event)
ProcessCommand (event); ProcessCommand (event);
} }
// Not implemented
#if 0
bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id, bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap *bitmap, const wxBitmap *bitmap,
const wxPoint& pos, const wxPoint& pos,
@@ -218,3 +220,4 @@ bool wxBitmapRadioButton::GetValue(void) const
return FALSE; return FALSE;
} }
#endif

438
src/os2/window.cpp
View File

File diff suppressed because it is too large Load Diff

1574
src/os2/wx23.def
View File

File diff suppressed because it is too large Load Diff