Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-28 15:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-26 19:53:08 +00:00
parent 23ff76d5ad
commit 0ba6a83624
13 changed files with 157 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gtk/win_gtk.c
+2 -3
View File
@@ -1,5 +1,5 @@
/* ///////////////////////////////////////////////////////////////////////////
// Name: win_gtk.c
// Name: src/gtk/win_gtk.c
// Purpose: Native GTK+ widget for wxWidgets, based on GtkLayout and
// GtkFixed. It makes use of the gravity window property and
// therefore does not work with GTK 1.0.
@@ -13,7 +13,7 @@
#define XCheckIfEvent XCHECKIFEVENT
#endif
#include "wx/setup.h"
#include "wx/defs.h"
#include "wx/gtk/win_gtk.h"
#include "gtk/gtksignal.h"
#include "gtk/gtkprivate.h"
@@ -886,4 +886,3 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
#ifdef __cplusplus
}
#endif /* __cplusplus */
src/gtk1/win_gtk.c
+2 -3
View File
@@ -1,5 +1,5 @@
/* ///////////////////////////////////////////////////////////////////////////
// Name: win_gtk.c
// Name: src/gtk1/win_gtk.c
// Purpose: Native GTK+ widget for wxWidgets, based on GtkLayout and
// GtkFixed. It makes use of the gravity window property and
// therefore does not work with GTK 1.0.
@@ -13,7 +13,7 @@
#define XCheckIfEvent XCHECKIFEVENT
#endif
#include "wx/setup.h"
#include "wx/defs.h"
#include "wx/gtk1/win_gtk.h"
#include "gtk/gtksignal.h"
#include "gtk/gtkprivate.h"
@@ -1202,4 +1202,3 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
#ifdef __cplusplus
}
#endif /* __cplusplus */
src/mac/carbon/gsocket.cpp
+1 -2
View File
@@ -1,6 +1,6 @@
/* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX
* Name: gsocket.cpp
* Name: src/mac/carbon/gsocket.cpp
* Copyright: (c) Guilhem Lavaux
* Licence: wxWindows Licence
* Authors: Guilhem Lavaux,
@@ -16,7 +16,6 @@
*/
#ifndef __GSOCKET_STANDALONE__
#include "wx/setup.h"
#include "wx/platform.h"
#endif
src/mac/classic/accel.cpp
+3 -4
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: accel.cpp
// Name: src/mac/classic/accel.cpp
// Purpose: wxAcceleratorTable
// Author: Stefan Csomor
// Modified by:
@@ -9,7 +9,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/setup.h"
#include "wx/wxprec.h"
#include "wx/accel.h"
#include "wx/string.h"
@@ -98,5 +99,3 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
return -1;
}
src/mac/classic/brush.cpp
+2 -1
View File
@@ -9,7 +9,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/setup.h"
#include "wx/wxprec.h"
#include "wx/utils.h"
#include "wx/brush.h"
src/mac/classic/glcanvas.cpp
+45 -47
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: glcanvas.cpp
// Name: src/mac/classic/glcanvas.cpp
// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
// Author: Stefan Csomor
// Modified by:
@@ -15,8 +15,6 @@
#pragma hdrstop
#endif
#include "wx/setup.h"
#if wxUSE_GLCANVAS
#ifndef WX_PRECOMP
@@ -44,12 +42,12 @@ wxGLContext::wxGLContext(
)
{
m_window = win;
m_drawable = (AGLDrawable) UMAGetWindowPort(MAC_WXHWND(win->MacGetRootWindow()));
m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );
GLboolean b;
b = aglSetDrawable(m_glContext, m_drawable);
wxCHECK_RET( b, wxT("Couldn't bind OpenGl context") );
@@ -147,14 +145,14 @@ wxGLCanvas::~wxGLCanvas()
static AGLPixelFormat ChoosePixelFormat(const int *attribList)
{
GLint data[512];
GLint defaultAttribs[] = { AGL_RGBA,
AGL_DOUBLEBUFFER,
AGL_MINIMUM_POLICY,
GLint defaultAttribs[] = { AGL_RGBA,
AGL_DOUBLEBUFFER,
AGL_MINIMUM_POLICY,
AGL_DEPTH_SIZE, 1, // use largest available depth buffer
AGL_RED_SIZE, 1,
AGL_GREEN_SIZE, 1,
AGL_BLUE_SIZE, 1,
AGL_ALPHA_SIZE, 0,
AGL_RED_SIZE, 1,
AGL_GREEN_SIZE, 1,
AGL_BLUE_SIZE, 1,
AGL_ALPHA_SIZE, 0,
AGL_NONE };
GLint *attribs;
if (!attribList)
@@ -164,7 +162,7 @@ static AGLPixelFormat ChoosePixelFormat(const int *attribList)
else
{
int arg=0, p=0;
data[p++] = AGL_MINIMUM_POLICY; // make _SIZE tags behave more like GLX
while( (attribList[arg]!=0) && (p<512) )
{
@@ -187,9 +185,9 @@ static AGLPixelFormat ChoosePixelFormat(const int *attribList)
data[p++]=AGL_BLUE_SIZE; data[p++]=attribList[arg++]; break;
case WX_GL_MIN_ALPHA:
data[p++]=AGL_ALPHA_SIZE; data[p++]=attribList[arg++]; break;
case WX_GL_DEPTH_SIZE:
case WX_GL_DEPTH_SIZE:
data[p++]=AGL_DEPTH_SIZE; data[p++]=attribList[arg++]; break;
case WX_GL_STENCIL_SIZE:
case WX_GL_STENCIL_SIZE:
data[p++]=AGL_STENCIL_SIZE; data[p++]=attribList[arg++]; break;
case WX_GL_MIN_ACCUM_RED:
data[p++]=AGL_ACCUM_RED_SIZE; data[p++]=attribList[arg++]; break;
@@ -202,12 +200,12 @@ static AGLPixelFormat ChoosePixelFormat(const int *attribList)
default:
break;
}
}
data[p] = 0;
}
data[p] = 0;
attribs = data;
}
return aglChoosePixelFormat(NULL, 0, attribs);
}
@@ -216,14 +214,14 @@ bool wxGLCanvas::Create(wxWindow *parent, const wxGLContext *shared, wxWindowID
int *attribList, const wxPalette& palette)
{
wxWindow::Create( parent, id, pos, size, style, name );
AGLPixelFormat fmt = ChoosePixelFormat(attribList);
wxCHECK_MSG( fmt, false, wxT("Couldn't create OpenGl pixel format") );
m_glContext = new wxGLContext(fmt, this, palette, shared);
m_macCanvasIsShown = true ;
aglDestroyPixelFormat(fmt);
return true;
}
@@ -245,30 +243,30 @@ void wxGLCanvas::SetViewport()
// adjust glViewport to just this window
int x = 0 ;
int y = 0 ;
wxWindow* iter = this ;
while( iter->GetParent() )
{
iter = iter->GetParent() ;
iter = iter->GetParent() ;
}
if ( iter && iter->IsTopLevel() )
{
MacClientToRootWindow( &x , &y ) ;
int width, height;
GetClientSize(& width, & height);
Rect bounds ;
GetWindowPortBounds( MAC_WXHWND(MacGetRootWindow()) , &bounds ) ;
GLint parms[4] ;
parms[0] = x ;
parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
parms[2] = width ;
parms[3] = height ;
if ( !m_macCanvasIsShown )
parms[0] += 20000 ;
aglSetInteger( m_glContext->m_glContext , AGL_BUFFER_RECT , parms ) ;
}
MacClientToRootWindow( &x , &y ) ;
int width, height;
GetClientSize(& width, & height);
Rect bounds ;
GetWindowPortBounds( MAC_WXHWND(MacGetRootWindow()) , &bounds ) ;
GLint parms[4] ;
parms[0] = x ;
parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
parms[2] = width ;
parms[3] = height ;
if ( !m_macCanvasIsShown )
parms[0] += 20000 ;
aglSetInteger( m_glContext->m_glContext , AGL_BUFFER_RECT , parms ) ;
}
}
void wxGLCanvas::OnSize(wxSizeEvent& event)
@@ -312,11 +310,11 @@ void wxGLCanvas::SetColour(const wxChar *colour)
m_glContext->SetColour(colour);
}
bool wxGLCanvas::Show(bool show)
bool wxGLCanvas::Show(bool show)
{
if ( !wxWindow::Show( show ) )
return FALSE ;
return false ;
if ( !show )
{
if ( m_macCanvasIsShown )
@@ -333,10 +331,10 @@ bool wxGLCanvas::Show(bool show)
SetViewport() ;
}
}
return TRUE ;
return true ;
}
void wxGLCanvas::MacSuperShown( bool show )
void wxGLCanvas::MacSuperShown( bool show )
{
if ( !show )
{
@@ -354,7 +352,7 @@ void wxGLCanvas::MacSuperShown( bool show )
SetViewport() ;
}
}
wxWindow::MacSuperShown( show ) ;
}
src/mac/classic/gsocket.c
+57 -58
View File
File diff suppressed because it is too large Load Diff
src/mac/classic/joystick.cpp
+15 -16
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: joystick.cpp
// Name: src/mac/classic/joystick.cpp
// Purpose: wxJoystick class
// Author: Stefan Csomor
// Modified by:
@@ -9,12 +9,12 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/setup.h"
#include "wx/joystick.h"
#include "wx/wxprec.h"
#if wxUSE_JOYSTICK
#include "wx/joystick.h"
IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
// Attributes
@@ -85,7 +85,7 @@ void wxJoystick::SetMovementThreshold(int threshold)
bool wxJoystick::IsOk() const
{
// TODO
return FALSE;
return false;
}
int wxJoystick::GetNumberJoysticks()
@@ -109,7 +109,7 @@ int wxJoystick::GetProductId() const
wxString wxJoystick::GetProductName() const
{
// TODO
return wxString(wxT(""));
return wxEmptyString;
}
int wxJoystick::GetXMin() const
@@ -223,43 +223,43 @@ int wxJoystick::GetVMax() const
bool wxJoystick::HasRudder() const
{
// TODO
return FALSE;
return false;
}
bool wxJoystick::HasZ() const
{
// TODO
return FALSE;
return false;
}
bool wxJoystick::HasU() const
{
// TODO
return FALSE;
return false;
}
bool wxJoystick::HasV() const
{
// TODO
return FALSE;
return false;
}
bool wxJoystick::HasPOV() const
{
// TODO
return FALSE;
return false;
}
bool wxJoystick::HasPOV4Dir() const
{
// TODO
return FALSE;
return false;
}
bool wxJoystick::HasPOVCTS() const
{
// TODO
return FALSE;
return false;
}
// Operations
@@ -268,15 +268,14 @@ bool wxJoystick::HasPOVCTS() const
bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq)
{
// TODO
return FALSE;
return false;
}
bool wxJoystick::ReleaseCapture()
{
// TODO
return FALSE;
return false;
}
#endif
// wxUSE_JOYSTICK
src/mac/classic/metafile.cpp
+20 -24
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: metafile.cpp
// Name: src/mac/classic/metafile.cpp
// Purpose: wxMetaFile, wxMetaFileDC etc. These classes are optional.
// Author: Stefan Csomor
// Modified by:
@@ -16,10 +16,6 @@
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/setup.h"
#endif
#if wxUSE_METAFILE
#ifndef WX_PRECOMP
@@ -68,7 +64,7 @@ wxMetaFile::wxMetaFile(const wxString& file)
M_METAFILEDATA->m_metafile = 0;
wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet") ) ;
/*
if (!file.IsNull() && (file.Cmp("") == 0))
if (!file.empty())
M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
*/
}
@@ -82,8 +78,8 @@ bool wxMetaFile::SetClipboard(int width, int height)
#if wxUSE_DRAG_AND_DROP
//TODO finishi this port , we need the data obj first
if (!m_refData)
return FALSE;
return false;
bool alreadyOpen=wxTheClipboard->IsOpened() ;
if (!alreadyOpen)
{
@@ -93,11 +89,11 @@ bool wxMetaFile::SetClipboard(int width, int height)
wxDataObject *data =
new wxMetafileDataObject( *this) ;
bool success = wxTheClipboard->SetData(data);
if (!alreadyOpen)
if (!alreadyOpen)
wxTheClipboard->Close();
return (bool) success;
#endif
return TRUE ;
return true ;
}
void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
@@ -113,17 +109,17 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
bool wxMetaFile::Play(wxDC *dc)
{
if (!m_refData)
return FALSE;
return false;
if (!dc->Ok() )
return FALSE;
return false;
{
wxMacPortSetter helper( dc ) ;
PicHandle pict = (PicHandle) GetHMETAFILE() ;
DrawPicture( pict , &(**pict).picFrame ) ;
}
return TRUE;
return true;
}
wxSize wxMetaFile::GetSize() const
@@ -149,23 +145,23 @@ wxSize wxMetaFile::GetSize() const
// give origin/extent arguments to wxMakeMetaFilePlaceable.
wxMetaFileDC::wxMetaFileDC(const wxString& filename ,
int width , int height ,
const wxString& WXUNUSED(description) )
int width , int height ,
const wxString& WXUNUSED(description) )
{
wxASSERT_MSG( width == 0 || height == 0 , _T("no arbitration of metafilesize supported") ) ;
wxASSERT_MSG( filename.IsEmpty() , _T("no file based metafile support yet")) ;
wxASSERT_MSG( filename.empty() , _T("no file based metafile support yet")) ;
m_metaFile = new wxMetaFile(filename) ;
Rect r={0,0,height,width} ;
RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
::GetPort( (GrafPtr*) &m_macPort ) ;
m_ok = TRUE ;
SetMapMode(wxMM_TEXT);
::GetPort( (GrafPtr*) &m_macPort ) ;
m_ok = true ;
SetMapMode(wxMM_TEXT);
}
wxMetaFileDC::~wxMetaFileDC()
src/mac/classic/pen.cpp
+2 -1
View File
@@ -9,7 +9,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/setup.h"
#include "wx/wxprec.h"
#include "wx/utils.h"
#include "wx/pen.h"
src/mac/classic/utils.cpp
+3 -3
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: utils.cpp
// Name: src/mac/classic/utils.cpp
// Purpose: Various utilities
// Author: Stefan Csomor
// Modified by:
@@ -9,7 +9,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/setup.h"
#include "wx/wxprec.h"
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/apptrait.h"
@@ -1399,4 +1400,3 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning()
#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400)
#endif // wxUSE_GUI
src/mac/classic/window.cpp
+2 -1
View File
@@ -9,7 +9,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/setup.h"
#include "wx/wxprec.h"
#include "wx/menu.h"
#include "wx/window.h"
#include "wx/dc.h"
src/mac/corefoundation/gsockosx.cpp
+3 -3
View File
@@ -1,12 +1,12 @@
/* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX
* Name: gsockosx.c
* Name: src/mac/corefoundation/gsockosx.c
* Purpose: GSocket: Mac OS X mach-o part
* CVSID: $Id$
* Mac code by Brian Victor, February 2002. Email comments to bhv1@psu.edu
* ------------------------------------------------------------------------- */
#include "wx/setup.h"
#include "wx/wxprec.h"
#if wxUSE_SOCKETS
@@ -75,7 +75,7 @@ struct MacGSocketData* _GSocket_Get_Mac_Socket(GSocket *socket)
cont.info = socket;
CFSocketRef cf = CFSocketCreateWithNative(NULL, socket->m_fd,
ALL_CALLBACK_TYPES, Mac_Socket_Callback, &cont);
ALL_CALLBACK_TYPES, Mac_Socket_Callback, &cont);
CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(NULL, cf, 0);
assert(source);
socket->m_gui_dependent = (char*)data;