solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Move wx/display_impl.h to wx/private/display.h

Browse source 
This shows more clearly that this header is private to wxWidgets and
can't be included by user code.

No real changes.
This commit is contained in:
Vadim Zeitlin 2018-05-22 23:10:45 +02:00
parent 6db5b54fc7
commit bac28b95cd
15 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/bakefiles/files.bkl
View file

@ -1124,7 +1124,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/dialup.h
wx/dirctrl.h
wx/display.h
wx/display_impl.h
wx/dnd.h
wx/docmdi.h
wx/docview.h

1
build/cmake/files.cmake
View file

@ -1032,7 +1032,6 @@ set(GUI_CMN_HDR
wx/dialup.h
wx/dirctrl.h
wx/display.h
wx/display_impl.h
wx/dnd.h
wx/docmdi.h
wx/docview.h

1
build/files
View file

@ -967,7 +967,6 @@ GUI_CMN_HDR =
wx/dirctrl.h
wx/dirdlg.h
wx/display.h
wx/display_impl.h
wx/dnd.h
wx/docmdi.h
wx/docview.h

1
build/msw/wx_core.vcxproj
View file

@ -1280,7 +1280,6 @@
<ClInclude Include="..\..\include\wx\dirctrl.h" />
<ClInclude Include="..\..\include\wx\dirdlg.h" />
<ClInclude Include="..\..\include\wx\display.h" />
<ClInclude Include="..\..\include\wx\display_impl.h" />
<ClInclude Include="..\..\include\wx\dnd.h" />
<ClInclude Include="..\..\include\wx\docmdi.h" />
<ClInclude Include="..\..\include\wx\docview.h" />

3
build/msw/wx_core.vcxproj.filters
View file

@ -1267,9 +1267,6 @@
<ClInclude Include="..\..\include\wx\display.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\display_impl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dnd.h">
<Filter>Common Headers</Filter>
</ClInclude>

3
build/msw/wx_vc7_core.vcproj
View file

@ -2270,9 +2270,6 @@
<File
RelativePath="..\..\include\wx\display.h">
</File>
<File
RelativePath="..\..\include\wx\display_impl.h">
</File>
<File
RelativePath="..\..\include\wx\dnd.h">
</File>

4
build/msw/wx_vc8_core.vcproj
View file

@ -3528,10 +3528,6 @@
RelativePath="..\..\include\wx\display.h"
>
</File>
<File
RelativePath="..\..\include\wx\display_impl.h"
>
</File>
<File
RelativePath="..\..\include\wx\dnd.h"
>

4
build/msw/wx_vc9_core.vcproj
View file

@ -3524,10 +3524,6 @@
RelativePath="..\..\include\wx\display.h"
>
</File>
<File
RelativePath="..\..\include\wx\display_impl.h"
>
</File>
<File
RelativePath="..\..\include\wx\dnd.h"
>

9
include/wx/display_impl.h → include/wx/private/display.h
View file

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/display_impl.h
// Name: wx/private/display.h
// Purpose: wxDisplayImpl class declaration
// Author: Vadim Zeitlin
// Created: 2006-03-15
@ -7,8 +7,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DISPLAY_IMPL_H_BASE_
#define _WX_DISPLAY_IMPL_H_BASE_
#ifndef _WX_PRIVATE_DISPLAY_H_
#define _WX_PRIVATE_DISPLAY_H_
#include "wx/gdicmn.h" // for wxRect
@ -105,5 +105,4 @@ public:
virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE;
};
#endif // _WX_DISPLAY_IMPL_H_BASE_
#endif // _WX_PRIVATE_DISPLAY_H_

2
src/common/dpycmn.cpp
View file

@ -30,7 +30,7 @@
#endif //WX_PRECOMP
#include "wx/display.h"
#include "wx/display_impl.h"
#include "wx/private/display.h"
#if wxUSE_DISPLAY

2
src/gtk/display.cpp
View file

@ -10,7 +10,7 @@
#if wxUSE_DISPLAY
#include "wx/display.h"
#include "wx/display_impl.h"
#include "wx/private/display.h"
#endif
#include "wx/utils.h" // wxClientDisplayRect

2
src/msw/display.cpp
View file

@ -39,7 +39,7 @@
#include "wx/dynlib.h"
#include "wx/sysopt.h"
#include "wx/display_impl.h"
#include "wx/private/display.h"
#include "wx/msw/missing.h"
#include "wx/msw/private.h"
#include "wx/msw/private/hiddenwin.h"

2
src/osx/core/display.cpp
View file

@ -33,7 +33,7 @@
#include "wx/gdicmn.h"
#endif
#include "wx/display_impl.h"
#include "wx/private/display.h"
#include "wx/scopedarray.h"
#include "wx/osx/private.h"

2
src/qt/display.cpp
View file

@ -9,7 +9,7 @@
#include "wx/wxprec.h"
#include "wx/display.h"
#include "wx/display_impl.h"
#include "wx/private/display.h"
#include <QtWidgets/QApplication>
#include <QtWidgets/QDesktopWidget>
#include "wx/qt/private/converter.h"

2
src/unix/displayx11.cpp
View file

@ -40,7 +40,7 @@
#if wxUSE_DISPLAY
#include "wx/display.h"
#include "wx/display_impl.h"
#include "wx/private/display.h"
#ifndef __WXGTK20__