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

1. fixed small bug with toolbar size updates

Browse Source 
2. fixed bug with showing message box from wxApp::OnInit()
3. fixed crash on DDE client disconnection
4. fixed wxExecute() which was broken since quite some time (hidden
   window creation problems) and in wxShell()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-15 22:36:52 +00:00
parent 4b89c61845
commit 0d7ea90249
8 changed files with 139 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/msw/msgdlg.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -21,26 +21,21 @@
#endif
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/defs.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#include "wx/defs.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#endif
#include "wx/msw/private.h"
#include <math.h>
#include <stdlib.h>
#include <string.h>
#define wxDIALOG_DEFAULT_X 300
#define wxDIALOG_DEFAULT_Y 300
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption,
long style, const wxPoint& pos)
wxMessageDialog::wxMessageDialog(wxWindow *parent,
const wxString& message,
const wxString& caption,
long style,
const wxPoint& WXUNUSED(pos))
{
m_caption = caption;
m_message = message;
@@ -48,60 +43,71 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& message, cons
m_parent = parent;
}
int wxMessageDialog::ShowModal(void)
int wxMessageDialog::ShowModal()
{
HWND hWnd = 0;
if (m_parent) hWnd = (HWND) m_parent->GetHWND();
unsigned int msStyle = MB_OK;
if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
msStyle = MB_YESNOCANCEL;
if ( !wxTheApp->GetTopWindow() )
{
// when the message box is shown from wxApp::OnInit() (i.e. before the
// message loop is entered), this must be done or the next message box
// will never be shown - just try putting 2 calls to wxMessageBox() in
// OnInit() to see it
while ( wxTheApp->Pending() )
wxTheApp->Dispatch();
}
HWND hWnd = 0;
if (m_parent) hWnd = (HWND) m_parent->GetHWND();
unsigned int msStyle = MB_OK;
if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
msStyle = MB_YESNOCANCEL;
else
msStyle = MB_YESNO;
if (m_dialogStyle & wxNO_DEFAULT)
msStyle |= MB_DEFBUTTON2;
}
if (m_dialogStyle & wxOK)
{
if (m_dialogStyle & wxCANCEL)
msStyle = MB_OKCANCEL;
else
msStyle = MB_OK;
}
if (m_dialogStyle & wxICON_EXCLAMATION)
msStyle |= MB_ICONEXCLAMATION;
else if (m_dialogStyle & wxICON_HAND)
msStyle |= MB_ICONHAND;
else if (m_dialogStyle & wxICON_INFORMATION)
msStyle |= MB_ICONINFORMATION;
else if (m_dialogStyle & wxICON_QUESTION)
msStyle |= MB_ICONQUESTION;
if (hWnd)
msStyle |= MB_APPLMODAL;
else
msStyle = MB_YESNO;
msStyle |= MB_TASKMODAL;
if (m_dialogStyle & wxNO_DEFAULT)
msStyle |= MB_DEFBUTTON2;
}
if (m_dialogStyle & wxOK)
{
if (m_dialogStyle & wxCANCEL)
msStyle = MB_OKCANCEL;
else
msStyle = MB_OK;
}
if (m_dialogStyle & wxICON_EXCLAMATION)
msStyle |= MB_ICONEXCLAMATION;
else if (m_dialogStyle & wxICON_HAND)
msStyle |= MB_ICONHAND;
else if (m_dialogStyle & wxICON_INFORMATION)
msStyle |= MB_ICONINFORMATION;
else if (m_dialogStyle & wxICON_QUESTION)
msStyle |= MB_ICONQUESTION;
if (hWnd)
msStyle |= MB_APPLMODAL;
else
msStyle |= MB_TASKMODAL;
int msAns = MessageBox(hWnd, (LPCTSTR)(const wxChar *)m_message, (LPCTSTR)(const wxChar *)m_caption, msStyle);
int ans = wxOK;
switch (msAns)
{
case IDCANCEL:
ans = wxID_CANCEL;
break;
case IDOK:
ans = wxID_OK;
break;
case IDYES:
ans = wxID_YES;
break;
case IDNO:
ans = wxID_NO;
break;
}
return ans;
int msAns = MessageBox(hWnd, (LPCTSTR)m_message.c_str(),
(LPCTSTR)m_caption.c_str(), msStyle);
int ans = wxOK;
switch (msAns)
{
case IDCANCEL:
ans = wxID_CANCEL;
break;
case IDOK:
ans = wxID_OK;
break;
case IDYES:
ans = wxID_YES;
break;
case IDNO:
ans = wxID_NO;
break;
}
return ans;
}