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

Wrap <commdlgs.h> as <commctls.h>. Required makefiles rebuilded.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-03-22 19:39:54 +00:00
parent f5c479ccfc
commit 660296aa90
20 changed files with 59 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -1348,6 +1348,7 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \
wx/msw/stackwalk.h \
wx/msw/winundef.h \
wx/msw/wrapcctl.h \
wx/msw/wrapcdlg.h \
wx/msw/wrapwin.h \
$(BASE_WINCE_HDR)
@COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR)

1
build/bakefiles/files.bkl
View File

@ -116,6 +116,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/stackwalk.h
wx/msw/winundef.h
wx/msw/wrapcctl.h
wx/msw/wrapcdlg.h
wx/msw/wrapwin.h
</set>
<set var="BASE_WINCE_HDR" hints="files">

4
build/msw/wx_base.dsp
View File

@ -1053,6 +1053,10 @@ SOURCE=..\..\include\wx\msw\wrapcctl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\wrapcdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\wrapwin.h
# End Source File
# End Group

26
include/wx/msw/wrapcdlg.h Normal file
View File

@ -0,0 +1,26 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/wrapcdlg.h
// Purpose: Wrapper for the standard <commdlg.h> header
// Author: Wlodzimierz ABX Skiba
// Modified by:
// Created: 22.03.2005
// RCS-ID: $Id$
// Copyright: (c) 2005 Wlodzimierz Skiba
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MSW_WRAPCDLG_H_
#define _WX_MSW_WRAPCDLG_H_
#include "wx/defs.h"
#include "wx/msw/wrapwin.h"
#include "wx/msw/private.h"
#include "wx/msw/missing.h"
#if wxUSE_COMMON_DIALOGS && !defined(__SMARTPHONE__) && !defined(__WXMICROWIN__)
#include <commdlg.h>
#endif
#endif // _WX_MSW_WRAPCDLG_H_

16
src/common/cmndata.cpp
View File

@ -50,17 +50,7 @@
#endif // wxUSE_PRINTING_ARCHITECTURE
#if defined(__WXMSW__)
#include <windowsx.h>
#include "wx/msw/private.h"
#ifndef __SMARTPHONE__ /* of WinCE */
#include <commdlg.h>
#endif
#if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
#include <windowsx.h>
#include <commdlg.h>
#endif
#include "wx/msw/wrapcdlg.h"
#endif // MSW
#if wxUSE_PRINTING_ARCHITECTURE
@ -187,7 +177,7 @@ wxPrintData::wxPrintData()
m_privData = NULL;
m_privDataLen = 0;
m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
}
@ -218,7 +208,7 @@ wxPrintData::~wxPrintData()
m_nativeData->m_ref--;
if (m_nativeData->m_ref == 0)
delete m_nativeData;
if (m_privData)
delete [] m_privData;

11
src/common/paper.cpp
View File

@ -38,13 +38,10 @@
#include <string.h>
#ifdef __WXMSW__
#include "wx/msw/wrapwin.h"
#include <commdlg.h>
#ifndef __WIN32__
#include <print.h>
#endif
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif
#endif
// End __WXMSW__

4
src/common/prntbase.cpp
View File

@ -59,9 +59,7 @@
#endif
#ifdef __WXMSW__
#include "wx/msw/private.h"
#include <commdlg.h>
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif

5
src/msw/colordlg.cpp
View File

@ -48,10 +48,7 @@
#include "wx/colordlg.h"
#include "wx/cmndata.h"
#include "wx/math.h"
#if !defined(__WIN32__) || defined(__WXWINCE__)
#include <commdlg.h>
#endif
#include "wx/msw/wrapcdlg.h"
#include <stdlib.h>
#include <string.h>

8
src/msw/dc.cpp
View File

@ -41,9 +41,6 @@
#include "wx/icon.h"
#endif
#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
#include "wx/msw/missing.h" // needs to be before #include <commdlg.h>
#include "wx/sysopt.h"
#include "wx/dcprint.h"
#include "wx/module.h"
@ -55,10 +52,7 @@
#include <string.h>
#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
#include <commdlg.h>
#endif
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif

5
src/msw/dcprint.cpp
View File

@ -48,10 +48,7 @@
#include "wx/msw/printdlg.h"
#include "wx/math.h"
#if wxUSE_COMMON_DIALOGS
#include <commdlg.h>
#endif
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif

8
src/msw/dialog.cpp
View File

@ -43,9 +43,7 @@
#include "wx/evtloop.h"
#include "wx/ptr_scpd.h"
#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
#include <commdlg.h>
#endif
#include "wx/msw/wrapcdlg.h"
#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
#include "wx/msw/wince/resources.h"
@ -463,7 +461,7 @@ bool wxDialog::DoOK()
event.SetEventObject(this);
return GetEventHandler()->ProcessEvent(event);
}
}
}
#endif
@ -484,7 +482,7 @@ wxToolBar *wxDialog::OnCreateToolBar(long style,
return new wxToolMenuBar(this, winid,
wxDefaultPosition, wxDefaultSize,
style, name);
}
}
#endif
// ---------------------------------------------------------------------------

7
src/msw/fdrepdlg.cpp
View File

@ -35,12 +35,7 @@
#include "wx/log.h"
#endif
#include "wx/msw/private.h"
#if !defined(__WIN32__) || defined(__WXWINCE__)
#include <commdlg.h>
#endif
#include "wx/msw/wrapcdlg.h"
#include "wx/fdrepdlg.h"
// ----------------------------------------------------------------------------

6
src/msw/filedlg.cpp
View File

@ -40,11 +40,7 @@
#include "wx/app.h"
#endif
#include "wx/msw/private.h"
#if !defined(__WIN32__) || defined(__WXWINCE__)
#include <commdlg.h>
#endif
#include "wx/msw/wrapcdlg.h"
#include <stdlib.h>
#include <string.h>

6
src/msw/fontdlg.cpp
View File

@ -37,11 +37,7 @@
#endif
#include "wx/fontdlg.h"
#include "wx/msw/private.h"
#if !defined(__WIN32__) || defined(__WXWINCE__)
#include <commdlg.h>
#endif
#include "wx/msw/wrapcdlg.h"
#include "wx/cmndata.h"
#include "wx/log.h"

6
src/msw/printdlg.cpp
View File

@ -44,9 +44,7 @@
#include <stdlib.h>
#include "wx/msw/private.h"
#include <commdlg.h>
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
@ -302,7 +300,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
// Not sure if we should check for this mismatch
// wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
// wxASSERT_MSG( (m_printerName.empty() || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
if (!printerName.empty())
data.SetPrinterName( printerName );

5
src/msw/printwin.cpp
View File

@ -52,10 +52,7 @@
#include <stdlib.h>
#include "wx/msw/private.h"
#include <commdlg.h>
#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif

4
src/wxWindows.dsp
View File

@ -3651,6 +3651,10 @@ SOURCE=..\include\wx\msw\wrapcctl.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\msw\wrapcdlg.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\msw\wrapwin.h
# End Source File
# End Group

1
wxGTK.spec
View File

@ -276,6 +276,7 @@ wx/msw/mimetype.h
wx/msw/stackwalk.h
wx/msw/winundef.h
wx/msw/wrapcctl.h
wx/msw/wrapcdlg.h
wx/msw/wrapwin.h
wx/fs_inet.h
wx/gsocket.h

1
wxMotif.spec
View File

@ -204,6 +204,7 @@ wx/msw/mimetype.h
wx/msw/stackwalk.h
wx/msw/winundef.h
wx/msw/wrapcctl.h
wx/msw/wrapcdlg.h
wx/msw/wrapwin.h
wx/fs_inet.h
wx/gsocket.h

1
wxX11.spec
View File

@ -255,6 +255,7 @@ wx/msw/mimetype.h
wx/msw/stackwalk.h
wx/msw/winundef.h
wx/msw/wrapcctl.h
wx/msw/wrapcdlg.h
wx/msw/wrapwin.h
wx/fs_inet.h
wx/gsocket.h