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

wxControl and wxDialog coded and supporting module def file.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-04-18 20:47:32 +00:00
parent 6c34d0ede9
commit c9cb56f7f2
3 changed files with 514 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
src/os2/control.cpp
View File

@@ -39,97 +39,98 @@ wxControl::wxControl()
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
m_callback = 0; m_callback = 0;
#endif // WXWIN_COMPATIBILITY #endif // WXWIN_COMPATIBILITY
} } // end of wxControl::wxControl
bool wxControl::Create(wxWindow *parent, wxWindowID id, bool wxControl::Create(
const wxPoint& pos, wxWindow* pParent
const wxSize& size, long style, , wxWindowID vId
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
const wxValidator& validator, , const wxValidator& rValidator
#endif #endif
const wxString& name) , const wxString& rsName
)
{ {
bool rval = wxWindow::Create(parent, id, pos, size, style, name); bool bRval = wxWindow::Create( pParent
if (rval) { ,vId
,rPos
,rSize
,lStyle
,rsName
);
if (bRval)
{
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
SetValidator(validator); SetValidator(rValidator);
#endif #endif
} }
return rval; return bRval;
} } // end of wxControl::Create
wxControl::~wxControl() wxControl::~wxControl()
{ {
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
} }
bool wxControl::OS2CreateControl(const wxChar *classname, bool wxControl::OS2CreateControl(
WXDWORD style, const wxChar* zClassname
const wxPoint& pos, , WXDWORD dwStyle
const wxSize& size, , const wxPoint& rPos
const wxString& label, , const wxSize& rSize
WXDWORD exstyle) , const wxString& rsLabel
, WXDWORD dwExstyle
)
{ {
// VZ: if someone could put a comment here explaining what exactly this is //
// needed for, it would be nice... // Doesn't do anything at all under OS/2
bool want3D; //
if (dwExstyle == (WXDWORD)-1)
// if no extended style given, determine it ourselves
if ( exstyle == (WXDWORD)-1 )
{ {
exstyle = GetExStyle(style); dwExstyle = GetExStyle(dwStyle);
} }
// TODO:
/*
// all controls have these childs (wxWindows creates all controls visible
// by default)
style |= WS_CHILD | WS_VISIBLE;
m_hWnd = (WXHWND)::CreateWindowEx
(
exstyle, // extended style
classname, // the kind of control to create
label, // the window name
style, // the window style
pos.x, pos.y, // the window position
size.x, size.y, // and size
GetHwndOf(GetParent()), // parent
(HMENU)GetId(), // child id
wxGetInstance(), // app instance
NULL // creation parameters
);
if ( !m_hWnd ) if ( !m_hWnd )
{ {
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
wxLogError(wxT("Failed to create a control of class '%s'"), classname); wxLogError(wxT("Failed to create a control of class '%s'"), zClassname);
#endif // DEBUG #endif // DEBUG
return FALSE; return FALSE;
} }
dwStyle |= WS_VISIBLE;
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(GetParent()) // Parent window handle
,(PSZ)zClassname // Window class
,(PSZ)rsLabel.c_str() // Initial Text
,(ULONG)dwStyle // Style flags
,(LONG)rPos.x // X pos of origin
,(LONG)rPos.y // Y pos of origin
,(LONG)rSize.x // control width
,(LONG)rSize.y // control height
,(HWND)GetHwndOf(GetParent()) // owner window handle (same as parent
,HWND_TOP // initial z position
,(ULONG)GetId() // Window identifier
,NULL // no control data
,NULL // no Presentation parameters
);
#if wxUSE_CTL3D //
if ( want3D ) // Subclass again for purposes of dialog editing mode
{ //
Ctl3dSubclassCtl(GetHwnd());
m_useCtl3D = TRUE;
}
#endif // wxUSE_CTL3D
// subclass again for purposes of dialog editing mode
SubclassWin(m_hWnd); SubclassWin(m_hWnd);
// controls use the same font and colours as their parent dialog by default //
// Controls use the same font and colours as their parent dialog by default
//
InheritAttributes(); InheritAttributes();
*/
return TRUE; return TRUE;
} } // end of wxControl::OS2CreateControl
wxSize wxControl::DoGetBestSize() const wxSize wxControl::DoGetBestSize() const
{ {
return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT); return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
} } // end of wxControl::DoGetBestSize
bool wxControl::ProcessCommand(wxCommandEvent& event) bool wxControl::ProcessCommand(wxCommandEvent& event)
{ {
@@ -146,92 +147,57 @@ bool wxControl::ProcessCommand(wxCommandEvent& event)
return GetEventHandler()->ProcessEvent(event); return GetEventHandler()->ProcessEvent(event);
} }
bool wxControl::OS2OnNotify(int idCtrl, WXHBRUSH wxControl::OnCtlColor(
WXLPARAM lParam, WXHDC hWxDC
WXLPARAM* result) , WXHWND hWnd
, WXUINT uCtlColor
, WXUINT uMessage
, WXWPARAM wParam
, WXLPARAM lParam
)
{ {
wxCommandEvent event(wxEVT_NULL, m_windowId); HPS hPS = (HPS)hWxDC; // pass in a PS handle in OS/2
wxEventType eventType = wxEVT_NULL; wxColour vColFore = GetForegroundColour();
/* TODO: wxColour vColBack = GetBackgroundColour();
NMHDR *hdr1 = (NMHDR*) lParam;
switch ( hdr1->code )
{
case NM_CLICK:
eventType = wxEVT_COMMAND_LEFT_CLICK;
break;
case NM_DBLCLK: if (GetParent()->GetTransparentBackground())
eventType = wxEVT_COMMAND_LEFT_DCLICK; ::GpiSetBackMix(hPS, BM_LEAVEALONE);
break; else
::GpiSetBackMix(hPS, BM_OVERPAINT);
case NM_RCLICK: ::GpiSetBackColor(hPS, vColBack.GetPixel());
eventType = wxEVT_COMMAND_RIGHT_CLICK; ::GpiSetColor(hPS, vColFore.GetPixel());
break;
case NM_RDBLCLK: wxBrush* pBrush = wxTheBrushList->FindOrCreateBrush( vColBack
eventType = wxEVT_COMMAND_RIGHT_DCLICK; ,wxSOLID
break; );
return (WXHBRUSH)pBrush->GetResourceHandle();
} // end of wxControl::OnCtlColor
case NM_SETFOCUS: void wxControl::OnEraseBackground(
eventType = wxEVT_COMMAND_SET_FOCUS; wxEraseEvent& rEvent
break; )
case NM_KILLFOCUS:
eventType = wxEVT_COMMAND_KILL_FOCUS;
break;
case NM_RETURN:
eventType = wxEVT_COMMAND_ENTER;
break;
default:
return wxWindow::OS2OnNotify(idCtrl, lParam, result);
}
*/
event.SetEventType(eventType);
event.SetEventObject(this);
return GetEventHandler()->ProcessEvent(event);
}
void wxControl::OnEraseBackground(wxEraseEvent& event)
{ {
// In general, you don't want to erase the background of a control, RECTL vRect;
// or you'll get a flicker. HPS hPS = rEvent.GetDC()->GetHPS();
// TODO: move this 'null' function into each control that SIZEL vSize = {0,0};
// might flicker.
RECT rect; ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT);
/* ::WinQueryWindowRect((HWND)GetHwnd(), &vRect);
* below is msw code. ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
* TODO: convert to PM Code } // end of wxControl::OnEraseBackground
* ::GetClientRect((HWND) GetHWND(), &rect);
*
* HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(),
* GetBackgroundColour().Green(),
* GetBackgroundColour().Blue()));
* int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
*
* ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
* ::DeleteObject(hBrush);
* ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
*/
}
WXDWORD wxControl::GetExStyle(WXDWORD& style) const WXDWORD wxControl::GetExStyle(
WXDWORD& rStyle
) const
{ {
bool want3D; //
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; // Meaningless under OS/2, just return what was sent
//
// Even with extended styles, need to combine with FS_BORDER WXDWORD exStyle = rStyle;
// for them to look right. Check it out later, base window style does
// not designate BORDERS. Down in Frame and And controls.
if ( want3D || wxStyleHasBorder(m_windowStyle) )
style |= FS_BORDER;
return exStyle; return exStyle;
} } // end of wxControl::GetExStyle
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// global functions // global functions
@@ -242,28 +208,32 @@ WXDWORD wxControl::GetExStyle(WXDWORD& style) const
// Call it initially with -1 for all values in rect. // Call it initially with -1 for all values in rect.
// Keep calling for other widgets, and rect will be modified // Keep calling for other widgets, and rect will be modified
// to calculate largest bounding rectangle. // to calculate largest bounding rectangle.
void wxFindMaxSize(WXHWND wnd, RECT *rect) void wxFindMaxSize(
WXHWND hWnd
, RECT* pRect
)
{ {
int left = rect->xLeft; int nLeft = pRect->xLeft;
int right = rect->xRight; int nRight = pRect->xRight;
int top = rect->yTop; int nTop = pRect->yTop;
int bottom = rect->yBottom; int nBottom = pRect->yBottom;
::WinQueryWindowRect((HWND) wnd, rect); ::WinQueryWindowRect((HWND)hWnd, pRect);
if (left < 0) if (nLeft < 0)
return; return;
if (left < rect->xLeft) if (nLeft < pRect->xLeft)
rect->xLeft = left; pRect->xLeft = nLeft;
if (right > rect->xRight) if (nRight > pRect->xRight)
rect->xRight = right; pRect->xRight = nRight;
if (top < rect->yTop) if (nTop < pRect->yTop)
rect->yTop = top; pRect->yTop = nTop;
if (nBottom > pRect->yBottom)
pRect->yBottom = nBottom;
} // end of wxFindMaxSize
if (bottom > rect->yBottom)
rect->yBottom = bottom;
}

645
src/os2/dialog.cpp
View File

@@ -28,6 +28,9 @@
#define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_X 300
#define wxDIALOG_DEFAULT_Y 300 #define wxDIALOG_DEFAULT_Y 300
#define wxDIALOG_DEFAULT_WIDTH 500
#define wxDIALOG_DEFAULT_HEIGHT 500
// Lists to keep track of windows, so we can disable/enable them // Lists to keep track of windows, so we can disable/enable them
// for modal dialogs // for modal dialogs
wxWindowList wxModalDialogs; wxWindowList wxModalDialogs;
@@ -46,334 +49,423 @@ extern wxList WXDLLEXPORT wxPendingDelete;
EVT_CLOSE(wxDialog::OnCloseWindow) EVT_CLOSE(wxDialog::OnCloseWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
wxDialog::wxDialog() void wxDialog::Init()
{ {
m_pOldFocus = (wxWindow *)NULL;
m_isShown = FALSE; m_isShown = FALSE;
m_modalShowing = FALSE; m_pWindowDisabler = (wxWindowDisabler *)NULL;
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
} } // end of wxDialog::Init
bool wxDialog::Create(wxWindow *parent, wxWindowID id, bool wxDialog::Create(
const wxString& title, wxWindow* pParent
const wxPoint& pos, , wxWindowID vId
const wxSize& size, , const wxString& rsTitle
long style, , const wxPoint& rPos
const wxString& name) , const wxSize& rSize
, long lStyle
, const wxString& rsName
)
{ {
#if wxUSE_TOOLTIPS long lX = rPos.x;
m_hwndToolTip = 0; long lY = rPos.y;
#endif long lWidth = rSize.x;
long lHeight = rSize.y;
const char* zDlg;
WXDWORD dwExtendedStyle = 0L;
HWND hWnd;
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); Init();
SetName(name); m_pOldFocus = (wxWindow*)FindFocus();
SetName(rsName);
if (!parent) wxTopLevelWindows.Append(this);
wxTopLevelWindows.Append(this); if (pParent)
pParent->AddChild(this);
if (parent) parent->AddChild(this); if (vId == -1)
m_windowId = NewControlId();
if ( id == -1 )
m_windowId = (int)NewControlId();
else else
m_windowId = id; m_windowId = vId;
if (lX < 0)
int x = pos.x; lX = wxDIALOG_DEFAULT_X;
int y = pos.y; if (lY < 0)
int width = size.x; lY = wxDIALOG_DEFAULT_Y;
int height = size.y; m_windowStyle = lStyle;
if (lWidth < 0)
if (x < 0) x = wxDIALOG_DEFAULT_X; lWidth = wxDIALOG_DEFAULT_WIDTH;
if (y < 0) y = wxDIALOG_DEFAULT_Y; if (lHeight < 0)
lHeight = wxDIALOG_DEFAULT_HEIGHT;
m_windowStyle = style;
m_isShown = FALSE;
m_modalShowing = FALSE;
if (width < 0)
width = 500;
if (height < 0)
height = 500;
// TODO: convert below to OS/2 PM code
//
// All dialogs should really have this style // All dialogs should really have this style
// m_windowStyle |= wxTAB_TRAVERSAL; //
// m_windowStyle |= wxTAB_TRAVERSAL;
// WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
// if (m_windowStyle & wxSTAY_ON_TOP) //
// extendedStyle |= WS_EX_TOPMOST;
//
// Allows creation of dialogs with & without captions under MSWindows, // Allows creation of dialogs with & without captions under MSWindows,
// resizeable or not (but a resizeable dialog always has caption - // resizeable or not (but a resizeable dialog always has caption -
// otherwise it would look too strange) // otherwise it would look too strange)
// const wxChar *dlg; //
// if ( style & wxRESIZE_BORDER ) if (lStyle & wxRESIZE_BORDER )
// dlg = wxT("wxResizeableDialog"); zDlg = "wxResizeableDialog";
// else if ( style & wxCAPTION ) else if (lStyle & wxCAPTION )
// dlg = wxT("wxCaptionDialog"); zDlg = "wxCaptionDialog";
// else else
// dlg = wxT("wxNoCaptionDialog"); zDlg = "wxNoCaptionDialog";
// MSWCreate(m_windowId, parent, NULL, this, NULL, OS2Create( GetWinHwnd(pParent)
// x, y, width, height, ,NULL
// 0, // style is not used if we have dlg template ,rsTitle.c_str()
// dlg, ,0L
// extendedStyle); ,lX
// ,lY
// HWND hwnd = (HWND)GetHWND(); ,lWidth
// ,lHeight
// if ( !hwnd ) ,GetWinHwnd(pParent)
// { ,HWND_TOP
// wxLogError(wxT("Failed to create dialog.")); ,(long)m_windowId
// ,NULL
// return FALSE; ,NULL
// } );
// hWnd = (HWND)GetHWND();
// SubclassWin(GetHWND()); if (!hWnd)
// {
// SetWindowText(hwnd, title); return FALSE;
// SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); }
// SubclassWin(GetHWND());
::WinSetWindowText( hWnd
,(PSZ)rsTitle.c_str()
);
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE; return TRUE;
} } // end of wxDialog::Create
void wxDialog::SetModal(bool flag) void wxDialog::SetModal(
bool bFlag
)
{ {
if ( flag ) if (bFlag)
m_windowStyle |= wxDIALOG_MODAL ; m_windowStyle |= wxDIALOG_MODAL ;
else if ( m_windowStyle & wxDIALOG_MODAL ) else if ( m_windowStyle & wxDIALOG_MODAL )
m_windowStyle -= wxDIALOG_MODAL ; m_windowStyle -= wxDIALOG_MODAL ;
wxModelessWindows.DeleteObject(this); wxModelessWindows.DeleteObject(this);
if (!flag) if (!bFlag)
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
} } // end of wxDialog::SetModal
wxDialog::~wxDialog() wxDialog::~wxDialog()
{ {
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
wxTopLevelWindows.DeleteObject(this); wxTopLevelWindows.DeleteObject(this);
Show(FALSE); Show(FALSE);
if (!IsModal)
if (m_modalShowing)
{
if (GetParent() && GetParent()->GetHWND())
// TODO: bring the parent to the top
return;
}
m_modalShowing = FALSE;
if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
wxModelessWindows.DeleteObject(this); wxModelessWindows.DeleteObject(this);
//
// If this is the last top-level window, exit. // If this is the last top-level window, exit.
//
if (wxTheApp && (wxTopLevelWindows.Number() == 0)) if (wxTheApp && (wxTopLevelWindows.Number() == 0))
{ {
wxTheApp->SetTopWindow(NULL); wxTheApp->SetTopWindow(NULL);
if (wxTheApp->GetExitOnFrameDelete()) if (wxTheApp->GetExitOnFrameDelete())
{ {
// TODO: exit ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0);
} }
} }
} } // end of wxDialog::~wxDialog
//
// By default, pressing escape cancels the dialog // By default, pressing escape cancels the dialog
void wxDialog::OnCharHook(wxKeyEvent& event) //
void wxDialog::OnCharHook(
wxKeyEvent& rEvent
)
{ {
if (GetHWND()) if (GetHWND())
{ {
if (event.m_keyCode == WXK_ESCAPE) if (rEvent.m_keyCode == WXK_ESCAPE)
{ {
//
// Behaviour changed in 2.0: we'll send a Cancel message // Behaviour changed in 2.0: we'll send a Cancel message
// to the dialog instead of Close. // to the dialog instead of Close.
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); //
cancelEvent.SetEventObject( this ); wxCommandEvent vCancelEvent( wxEVT_COMMAND_BUTTON_CLICKED
GetEventHandler()->ProcessEvent(cancelEvent); ,wxID_CANCEL
);
vCancelEvent.SetEventObject( this );
GetEventHandler()->ProcessEvent(vCancelEvent);
//
// Ensure that there is another message for this window so the
// ShowModal loop will exit and won't get stuck in GetMessage().
//
::WinPostMsg(GetHwnd(), WM_NULL, 0, 0);
return; return;
} }
} }
// We didn't process this event. // We didn't process this event.
event.Skip(); rEvent.Skip();
} }
void wxDialog::OnPaint(wxPaintEvent& event) void wxDialog::Iconize(
bool WXUNUSED(bIconize)
)
{ {
// No: if you call the default procedure, it makes } // end of wxDialog::Iconize
// the following painting code not work.
// wxWindow::OnPaint(event);
}
void wxDialog::Fit()
{
wxWindow::Fit();
}
void wxDialog::Iconize(bool WXUNUSED(iconize))
{
// Windows dialog boxes can't be iconized
}
bool wxDialog::IsIconized() const bool wxDialog::IsIconized() const
{ {
return FALSE; return FALSE;
} } // end of wxDialog::IsIconized
void wxDialog::DoSetClientSize(int width, int height) void wxDialog::DoSetClientSize(
int nWidth
, int nHeight
)
{ {
// TODO: Convert the below to OS/2 PM code HWND hWnd = (HWND) GetHWND();
RECTL vRect;
RECTL vRect2;
// HWND hWnd = (HWND) GetHWND(); ::WinQueryWindowRect(hWnd, &vRect);
// RECT rect; ::WinQueryWindowRect(hWnd, &vRect2);
// ::GetClientRect(hWnd, &rect);
//
// RECT rect2;
// GetWindowRect(hWnd, &rect2);
//
// 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
// int actual_width = rect2.right - rect2.left - rect.right + width;
// int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
// MoveWindow(hWnd, rect2.left, rect2.top, actual_width, actual_height, TRUE); LONG lActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
// LONG lActualHeight = vRect2.yTop + vRect2.yTop - vRect.yTop + nHeight;
// wxSizeEvent event(wxSize(actual_width, actual_height), m_windowId);
// event.SetEventObject( this ); ::WinSetWindowPos( GetHwnd()
// GetEventHandler()->ProcessEvent(event); ,HWND_TOP
} ,(LONG)vRect2.xLeft
void wxDialog::GetPosition(int *x, int *y) const ,(LONG)vRect2.yTop
,(LONG)lActualWidth
,(LONG)lActualHeight
,SWP_SIZE | SWP_MOVE
);
wxSizeEvent vEvent( wxSize( lActualWidth
,lActualHeight
)
,m_windowId
);
vEvent.SetEventObject( this );
GetEventHandler()->ProcessEvent(vEvent);
} // end of wxDialog::DoSetClientSize
void wxDialog::DoGetPosition(
int* pnX
, int* pnY
) const
{ {
// TODO: Convert RECTL vRect;
// HWND hWnd = (HWND) GetHWND();
// RECT rect;
// GetWindowRect(hWnd, &rect);
// *x = rect.left; ::WinQueryWindowRect(GetHwnd(), &vRect);
// *y = rect.top; if (pnX)
} *pnX = vRect.xLeft;
if (pnY)
bool wxDialog::IsShown() const *pnY = vRect.yBottom; // OS/2's bottom is windows' top???
{ } // end of wxDialog::DoGetPosition
return m_isShown;
}
bool wxDialog::IsModal() const bool wxDialog::IsModal() const
{ {
return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
} } // end of wxDialog::IsModal
bool wxDialog::Show(bool show) bool wxDialog::IsModalShowing() const
{ {
// TODO: This is involved code, look at msw port for details return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
return FALSE; } // end of wxDialog::IsModalShowing
}
void wxDialog::SetTitle(const wxString& title) void wxDialog::DoShowModal()
{ {
::WinSetWindowText((HWND) GetHWND(), title.c_str()); wxWindow* pParent = GetParent();
} wxWindow* pOldFocus = m_pOldFocus;
HWND hWndOldFocus = 0;
wxString wxDialog::GetTitle() const wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
{ wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
::WinQueryWindowText((HWND) GetHWND(), 1000, wxBuffer);
return wxString(wxBuffer);
}
void wxDialog::Centre(int direction) wxModalDialogs.Append(this);
{ if (pOldFocus)
int x_offset,y_offset ; hWndOldFocus = (HWND)pOldFocus->GetHWND();
int display_width, display_height;
int width, height, x, y;
wxWindow *parent = GetParent();
if ((direction & wxCENTER_FRAME) && parent)
{
parent->GetPosition(&x_offset,&y_offset) ;
parent->GetSize(&display_width,&display_height) ;
}
else
{
wxDisplaySize(&display_width, &display_height);
x_offset = 0 ;
y_offset = 0 ;
}
GetSize(&width, &height); //
GetPosition(&x, &y); // Remember where the focus was
//
if (direction & wxHORIZONTAL) if (!pOldFocus)
x = (int)((display_width - width)/2);
if (direction & wxVERTICAL)
y = (int)((display_height - height)/2);
SetSize(x+x_offset, y+y_offset, width, height);
}
// Replacement for Show(TRUE) for modal dialogs - returns return code
int wxDialog::ShowModal()
{
m_windowStyle |= wxDIALOG_MODAL;
Show(TRUE);
return GetReturnCode();
}
void wxDialog::EndModal(int retCode)
{
SetReturnCode(retCode);
// TODO modal un-showing
Show(FALSE);
}
// Define for each class of dialog and control
WXHBRUSH wxDialog::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
return 0;
}
// Standard buttons
void wxDialog::OnOK(wxCommandEvent& event)
{
if ( Validate() && TransferDataFromWindow() )
{ {
if ( IsModal() ) pOldFocus = pParent;
EndModal(wxID_OK); if (pParent)
else hWndOldFocus = GetHwndOf(pParent);
}
//
// Disable all other app windows
//
wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?"));
m_pWindowDisabler = new wxWindowDisabler(this);
//
// Enter the modal loop
//
while ( IsModalShowing() )
{
#if wxUSE_THREADS
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
;
// a message came or no more idle processing to do
wxTheApp->DoMessage();
}
//
// Snd restore focus
// Note that this code MUST NOT access the dialog object's data
// in case the object has been deleted (which will be the case
// for a modal dialog that has been destroyed before calling EndModal).
//
if (pOldFocus && (pOldFocus != this) && ::WinIsWindow(vHabmain, hWndOldFocus))
{
//
// This is likely to prove that the object still exists
//
if (wxFindWinFromHandle((WXHWND) hWndOldFocus) == pOldFocus)
pOldFocus->SetFocus();
}
} // end of wxDialog::DoShowModal
bool wxDialog::Show(
bool bShow
)
{
if (!bShow)
{
//
// If we had disabled other app windows, reenable them back now because
// if they stay disabled Windows will activate another window (one
// which is enabled, anyhow) and we will lose activation
//
if (m_pWindowDisabler)
{ {
SetReturnCode(wxID_OK); delete m_pWindowDisabler;
this->Show(FALSE); m_pWindowDisabler = NULL;
} }
} }
}
void wxDialog::OnApply(wxCommandEvent& event) //
// ShowModal() may be called for already shown dialog
//
if (!wxDialogBase::Show(bShow) && !(bShow && IsModal()))
{
//
// Nothing to do
//
return FALSE;
}
if (bShow)
{
//
// Usually will result in TransferDataToWindow() being called
//
InitDialog();
}
if (IsModal())
{
if (bShow)
{
//
// Modal dialog needs a parent window, so try to find one
//
if (!GetParent())
{
wxWindow* pParent = wxTheApp->GetTopWindow();
if ( pParent && pParent != this && pParent->IsShown() )
{
//
// Use it
//
m_parent = pParent;
}
}
DoShowModal();
}
else // end of modal dialog
{
//
// This will cause IsModalShowing() return FALSE and our local
// message loop will terminate
//
wxModalDialogs.DeleteObject(this);
}
}
return FALSE;
} // end of wxDialog::Show
//
// Replacement for Show(TRUE) for modal dialogs - returns return code
//
int wxDialog::ShowModal()
{
if (!IsModal())
{
SetModal(TRUE);
}
Show(TRUE);
return GetReturnCode();
} // end of wxDialog::ShowModal
void wxDialog::EndModal(
int nRetCode
)
{
SetReturnCode(nRetCode);
Show(FALSE);
} // end of wxDialog::EndModal
void wxDialog::OnApply(
wxCommandEvent& rEvent
)
{ {
if (Validate()) if (Validate())
TransferDataFromWindow(); TransferDataFromWindow();
// TODO probably need to disable the Apply button until things change again } // end of wxDialog::OnApply
}
void wxDialog::OnCancel(wxCommandEvent& event) // Standard buttons
void wxDialog::OnOK(
wxCommandEvent& rEvent
)
{ {
if ( IsModal() ) if ( Validate() && TransferDataFromWindow() )
EndModal(wxID_CANCEL);
else
{ {
SetReturnCode(wxID_CANCEL); EndModal(wxID_OK);
this->Show(FALSE);
} }
} } // end of wxDialog::OnOK
void wxDialog::OnCloseWindow(wxCloseEvent& event) void wxDialog::OnCancel(
wxCommandEvent& rEvent
)
{ {
EndModal(wxID_CANCEL);
} // end of wxDialog::OnCancel
void wxDialog::OnCloseWindow(
wxCloseEvent& rEvent
)
{
//
// We'll send a Cancel message by default, // We'll send a Cancel message by default,
// which may close the dialog. // which may close the dialog.
// Check for looping if the Cancel event handler calls Close(). // Check for looping if the Cancel event handler calls Close().
//
// Note that if a cancel button and handler aren't present in the dialog, // Note that if a cancel button and handler aren't present in the dialog,
// nothing will happen when you close the dialog via the window manager, or // nothing will happen when you close the dialog via the window manager, or
// via Close(). // via Close().
@@ -383,7 +475,11 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
// unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
// sure to destroy the dialog. // sure to destroy the dialog.
// The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog. // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
//
//
// Ugh??? This is not good but until I figure out a global list it'll have to do
//
static wxList closing; static wxList closing;
if ( closing.Member(this) ) if ( closing.Member(this) )
@@ -391,55 +487,58 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
closing.Append(this); closing.Append(this);
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); wxCommandEvent vCancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
cancelEvent.SetEventObject( this );
GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog vCancelEvent.SetEventObject( this );
GetEventHandler()->ProcessEvent(vCancelEvent); // This may close the dialog
closing.DeleteObject(this); closing.DeleteObject(this);
} } // end of wxDialog::OnCloseWindow
//
// Destroy the window (delayed, if a managed window) // Destroy the window (delayed, if a managed window)
//
bool wxDialog::Destroy() bool wxDialog::Destroy()
{ {
if (!wxPendingDelete.Member(this)) wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE,
wxPendingDelete.Append(this); _T("wxDialog destroyed twice") );
wxPendingDelete.Append(this);
return TRUE; return TRUE;
} } // end of wxDialog::Destroy
void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event)) void wxDialog::OnSysColourChanged(
wxSysColourChangedEvent& rEvent
)
{ {
// if we're using constraints - do use them SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
#if wxUSE_CONSTRAINTS Refresh();
if ( GetAutoLayout() ) } // end of wxDialog::OnSysColourChanged
{
Layout();
}
#endif
}
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) MRESULT wxDialog::OS2WindowProc(
WXUINT uMessage
, WXWPARAM wParam
, WXLPARAM lParam
)
{ {
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); MRESULT rc = 0;
Refresh(); bool bProcessed = FALSE;
}
MRESULT wxDialog::OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) switch (uMessage)
{
MRESULT rc = 0;
bool processed = FALSE;
switch ( message )
{ {
case WM_CLOSE: case WM_CLOSE:
// if we can't close, tell the system that we processed the //
// If we can't close, tell the system that we processed the
// message - otherwise it would close us // message - otherwise it would close us
processed = !Close(); //
bProcessed = !Close();
break; break;
} }
if ( !processed ) if (!bProcessed)
rc = wxWindow::OS2WindowProc(message, wParam, lParam); rc = wxWindow::OS2WindowProc( uMessage
,wParam
,lParam
);
return rc; return rc;
} } // end of wxDialog::OS2WindowProc

52
src/os2/wx23.def
View File

@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
CODE LOADONCALL CODE LOADONCALL
EXPORTS EXPORTS
;From library: H:\Dev\Wx2\WxWindows\lib\wx.lib ;From library: H:\Dev\Wx2\Wxwindows\lib\wx.lib
;From object file: dummy.cpp ;From object file: dummy.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
wxDummyChar wxDummyChar
@@ -10694,8 +10694,6 @@ EXPORTS
sm_eventTable__9wxControl sm_eventTable__9wxControl
;wxControl::OS2CreateControl(const char*,unsigned long,const wxPoint&,const wxSize&,const wxString&,unsigned long) ;wxControl::OS2CreateControl(const char*,unsigned long,const wxPoint&,const wxSize&,const wxString&,unsigned long)
OS2CreateControl__9wxControlFPCcUlRC7wxPointRC6wxSizeRC8wxStringT2 OS2CreateControl__9wxControlFPCcUlRC7wxPointRC6wxSizeRC8wxStringT2
;wxControl::OS2OnNotify(int,void*,void**)
OS2OnNotify__9wxControlFiPvPPv
;wxControl::GetExStyle(unsigned long&) const ;wxControl::GetExStyle(unsigned long&) const
GetExStyle__9wxControlCFRUl GetExStyle__9wxControlCFRUl
;wxControl::sm_eventTableEntries ;wxControl::sm_eventTableEntries
@@ -10708,6 +10706,8 @@ EXPORTS
Create__9wxControlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString Create__9wxControlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
;wxControl::ProcessCommand(wxCommandEvent&) ;wxControl::ProcessCommand(wxCommandEvent&)
ProcessCommand__9wxControlFR14wxCommandEvent ProcessCommand__9wxControlFR14wxCommandEvent
;wxControl::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
OnCtlColor__9wxControlFUlT1UiT3PvT5
;wxControl::wxControl() ;wxControl::wxControl()
__ct__9wxControlFv __ct__9wxControlFv
;wxControl::GetEventTable() const ;wxControl::GetEventTable() const
@@ -11151,20 +11151,16 @@ EXPORTS
SetModal__8wxDialogFUl SetModal__8wxDialogFUl
;wxDialog::OnCancel(wxCommandEvent&) ;wxDialog::OnCancel(wxCommandEvent&)
OnCancel__8wxDialogFR14wxCommandEvent OnCancel__8wxDialogFR14wxCommandEvent
;wxDialog::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*) ;wxDialog::DoGetPosition(int*,int*) const
OnCtlColor__8wxDialogFUlT1UiT3PvT5 DoGetPosition__8wxDialogCFPiT1
;wxDialog::IsIconized() const ;wxDialog::IsIconized() const
IsIconized__8wxDialogCFv IsIconized__8wxDialogCFv
;wxDialog::IsModal() const ;wxDialog::IsModal() const
IsModal__8wxDialogCFv IsModal__8wxDialogCFv
;wxDialog::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&) ;wxDialog::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
Create__8wxDialogFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3 Create__8wxDialogFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
;wxDialog::SetTitle(const wxString&) ;wxDialog::IsModalShowing() const
SetTitle__8wxDialogFRC8wxString IsModalShowing__8wxDialogCFv
;wxDialog::OnPaint(wxPaintEvent&)
OnPaint__8wxDialogFR12wxPaintEvent
;wxDialog::OnSize(wxSizeEvent&)
OnSize__8wxDialogFR11wxSizeEvent
wxModalDialogs wxModalDialogs
;wxDialog::sm_eventTableEntries ;wxDialog::sm_eventTableEntries
sm_eventTableEntries__8wxDialog sm_eventTableEntries__8wxDialog
@@ -11174,8 +11170,8 @@ EXPORTS
OnCloseWindow__8wxDialogFR12wxCloseEvent OnCloseWindow__8wxDialogFR12wxCloseEvent
;wxDialog::DoSetClientSize(int,int) ;wxDialog::DoSetClientSize(int,int)
DoSetClientSize__8wxDialogFiT1 DoSetClientSize__8wxDialogFiT1
;wxDialog::GetPosition(int*,int*) const ;wxDialog::Init()
GetPosition__8wxDialogCFPiT1 Init__8wxDialogFv
;wxDialog::ShowModal() ;wxDialog::ShowModal()
ShowModal__8wxDialogFv ShowModal__8wxDialogFv
;wxDialog::sm_classwxDialog ;wxDialog::sm_classwxDialog
@@ -11185,12 +11181,8 @@ EXPORTS
__vft8wxDialog8wxObject __vft8wxDialog8wxObject
;wxDialog::OnSysColourChanged(wxSysColourChangedEvent&) ;wxDialog::OnSysColourChanged(wxSysColourChangedEvent&)
OnSysColourChanged__8wxDialogFR23wxSysColourChangedEvent OnSysColourChanged__8wxDialogFR23wxSysColourChangedEvent
;wxDialog::Centre(int) ;wxDialog::DoShowModal()
Centre__8wxDialogFi DoShowModal__8wxDialogFv
;wxDialog::wxDialog()
__ct__8wxDialogFv
;wxDialog::GetTitle() const
GetTitle__8wxDialogCFv
;wxDialog::Destroy() ;wxDialog::Destroy()
Destroy__8wxDialogFv Destroy__8wxDialogFv
;wxDialog::Iconize(unsigned long) ;wxDialog::Iconize(unsigned long)
@@ -11207,12 +11199,8 @@ EXPORTS
wxConstructorForwxDialog__Fv wxConstructorForwxDialog__Fv
;wxDialog::OS2WindowProc(unsigned int,void*,void*) ;wxDialog::OS2WindowProc(unsigned int,void*,void*)
OS2WindowProc__8wxDialogFUiPvT2 OS2WindowProc__8wxDialogFUiPvT2
;wxDialog::IsShown() const
IsShown__8wxDialogCFv
;wxDialog::GetEventTable() const ;wxDialog::GetEventTable() const
GetEventTable__8wxDialogCFv GetEventTable__8wxDialogCFv
;wxDialog::Fit()
Fit__8wxDialogFv
wxModelessWindows wxModelessWindows
;wxDialog::sm_eventTable ;wxDialog::sm_eventTable
sm_eventTable__8wxDialog sm_eventTable__8wxDialog
@@ -12860,6 +12848,8 @@ EXPORTS
sm_classwxStaticText__12wxStaticText sm_classwxStaticText__12wxStaticText
;wxConstructorForwxStaticText() ;wxConstructorForwxStaticText()
wxConstructorForwxStaticText__Fv wxConstructorForwxStaticText__Fv
;wxStaticText::SetFont(const wxFont&)
SetFont__12wxStaticTextFRC6wxFont
__vft12wxStaticText8wxObject __vft12wxStaticText8wxObject
;wxStaticText::DoGetBestSize() const ;wxStaticText::DoGetBestSize() const
DoGetBestSize__12wxStaticTextCFv DoGetBestSize__12wxStaticTextCFv
@@ -13107,14 +13097,18 @@ EXPORTS
OnDropFiles__10wxTextCtrlFR16wxDropFilesEvent OnDropFiles__10wxTextCtrlFR16wxDropFilesEvent
;wxTextCtrl::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*) ;wxTextCtrl::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
OnCtlColor__10wxTextCtrlFUlT1UiT3PvT5 OnCtlColor__10wxTextCtrlFUlT1UiT3PvT5
;wxTextCtrl::GetInsertionPoint() const
GetInsertionPoint__10wxTextCtrlCFv
;wxTextCtrl::Undo()
Undo__10wxTextCtrlFv
;wxTextCtrl::PositionToXY(long,long*,long*) const
PositionToXY__10wxTextCtrlCFlPlT2
;wxTextCtrl::AdjustSpaceLimit() ;wxTextCtrl::AdjustSpaceLimit()
AdjustSpaceLimit__10wxTextCtrlFv AdjustSpaceLimit__10wxTextCtrlFv
;wxTextCtrl::Undo()
Undo__10wxTextCtrlFv
;wxTextCtrl::SetForegroundColour(const wxColour&)
SetForegroundColour__10wxTextCtrlFRC8wxColour
;wxTextCtrl::SetBackgroundColour(const wxColour&)
SetBackgroundColour__10wxTextCtrlFRC8wxColour
;wxTextCtrl::PositionToXY(long,long*,long*) const
PositionToXY__10wxTextCtrlCFlPlT2
;wxTextCtrl::GetInsertionPoint() const
GetInsertionPoint__10wxTextCtrlCFv
;wxTextCtrl::SetValue(const wxString&) ;wxTextCtrl::SetValue(const wxString&)
SetValue__10wxTextCtrlFRC8wxString SetValue__10wxTextCtrlFRC8wxString
;wxTextCtrl::WriteText(const wxString&) ;wxTextCtrl::WriteText(const wxString&)