git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37159
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
23 files changed:
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/common/bitmap.cpp
// Purpose: wxBitmapBase
// Author: VaclavSlavik
// Created: 2001/04/11
// Purpose: wxBitmapBase
// Author: VaclavSlavik
// Created: 2001/04/11
defined(__WXMOTIF__) || \
defined(__WXX11__)
defined(__WXMOTIF__) || \
defined(__WXX11__)
#include "wx/utils.h"
#include "wx/palette.h"
#include "wx/bitmap.h"
#include "wx/utils.h"
#include "wx/palette.h"
#include "wx/bitmap.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/common/imagall.cpp
// Purpose: wxImage access all handler
// Author: Sylvain Bougnoux
// RCS-ID: $Id$
// Purpose: wxImage access all handler
// Author: Sylvain Bougnoux
// RCS-ID: $Id$
#endif
#ifndef WX_PRECOMP
#endif
#ifndef WX_PRECOMP
#endif
#include "wx/image.h"
#endif
#include "wx/image.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/common/imagpnm.cpp
// Purpose: wxImage PNM handler
// Author: Sylvain Bougnoux
// RCS-ID: $Id$
// Purpose: wxImage PNM handler
// Author: Sylvain Bougnoux
// RCS-ID: $Id$
#endif
#ifndef WX_PRECOMP
#endif
#ifndef WX_PRECOMP
#endif
#if wxUSE_IMAGE && wxUSE_PNM
#endif
#if wxUSE_IMAGE && wxUSE_PNM
#include "wx/dcmemory.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/dcmemory.h"
#include "wx/utils.h"
#include "wx/intl.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/generic/dragimgg.cpp
// Purpose: Generic wxDragImage implementation
// Author: Julian Smart
// Modified by:
// Purpose: Generic wxDragImage implementation
// Author: Julian Smart
// Modified by:
#ifndef WX_PRECOMP
#include <stdio.h>
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/window.h"
#include "wx/frame.h"
#include "wx/dcclient.h"
#include "wx/window.h"
#include "wx/frame.h"
#include "wx/dcclient.h"
#if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))
#ifndef WX_PRECOMP
#if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))
#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/list.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/list.h"
#if wxUSE_STATUSBAR
#ifndef WX_PRECOMP
#if wxUSE_STATUSBAR
#ifndef WX_PRECOMP
#include "wx/frame.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
#include "wx/frame.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/filedlg.cpp
+// Name: src/gtk/filedlg.cpp
// Purpose: native implementation of wxFileDialog
// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
// Id: $Id$
// Purpose: native implementation of wxFileDialog
// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-// Include setup.h to get wxUSE flags for compilers that do not support precompilation of headers
-#include "wx/setup.h"
-
#if wxUSE_FILEDLG
#include "wx/filedlg.h"
#if wxUSE_FILEDLG
#include "wx/filedlg.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/glcanvas.cpp
+// Name: src/gtk/glcanvas.cpp
// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_GLCANVAS
#include "wx/glcanvas.h"
#if wxUSE_GLCANVAS
#include "wx/glcanvas.h"
/* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX
/* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX
+ * Name: src/gtk/gsockgtk.cpp
* Purpose: GSocket: GTK part
* Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
* Purpose: GSocket: GTK part
* Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk/tooltip.cpp
// Purpose: wxToolTip implementation
// Author: Robert Roebling
// Id: $Id$
// Purpose: wxToolTip implementation
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/filedlg.cpp
+// Name: src/gtk1/filedlg.cpp
// Purpose: native implementation of wxFileDialog
// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
// Id: $Id$
// Purpose: native implementation of wxFileDialog
// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-// Include setup.h to get wxUSE flags for compilers that do not support precompilation of headers
-#include "wx/setup.h"
-
#if wxUSE_FILEDLG
#include "wx/filedlg.h"
#if wxUSE_FILEDLG
#include "wx/filedlg.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/glcanvas.cpp
+// Name: src/gtk1/glcanvas.cpp
// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_GLCANVAS
#include "wx/glcanvas.h"
#if wxUSE_GLCANVAS
#include "wx/glcanvas.h"
/* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX
/* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX
+ * Name: src/gtk1/gsockgtk.cpp
* Purpose: GSocket: GTK part
* Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
* Purpose: GSocket: GTK part
* Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk1/tooltip.cpp
// Purpose: wxToolTip implementation
// Author: Robert Roebling
// Id: $Id$
// Purpose: wxToolTip implementation
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/mgl/gdiobj.cpp
// Purpose: wxGDIObject class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Purpose: wxGDIObject class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#ifndef WX_PRECOMP
#include <stdio.h>
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/list.h"
#include "wx/utils.h"
#endif
#include "wx/list.h"
#include "wx/utils.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
#include "wx/window.h"
#include "wx/msgdlg.h"
#include "wx/accel.h"
#include "wx/window.h"
#include "wx/msgdlg.h"
#include "wx/accel.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/utils.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/utils.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/accel.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/accel.h"
#include "wx/string.h"
#include "wx/utils.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
(XtPointer) this);
wxSize best = GetBestSize();
(XtPointer) this);
wxSize best = GetBestSize();
- if( size.x != -1 ) best.x = size.x;
- if( size.y != -1 ) best.y = size.y;
+ if( size.x != wxDefaultCoord ) best.x = size.x;
+ if( size.y != wxDefaultCoord ) best.y = size.y;
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, best.x, best.y);
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, best.x, best.y);
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
+// Name: src/motif/dnd.cpp
// Purpose: wxDropTarget, wxDropSource classes
// Author: Julian Smart
// Id: $Id$
// Copyright: (c) 1998 Julian Smart
// Purpose: wxDropTarget, wxDropSource classes
// Author: Julian Smart
// Id: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
///////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
for (i = 0; i < size; i++)
if (text[i] == 0) number++;
for (i = 0; i < size; i++)
if (text[i] == 0) number++;
- if (number == 0) return true;
-
+ if (number == 0) return true;
+
char **files = new char*[number];
char **files = new char*[number];
text = (char*) data;
for ( i = 0; i < number; i++)
{
text = (char*) data;
for ( i = 0; i < number; i++)
{
- bool ret = OnDropFiles( x, y, 1, files );
-
+ bool ret = OnDropFiles( x, y, 1, files );
+
{
#if 0
g_blockEventsOnDrag = true;
{
#if 0
g_blockEventsOnDrag = true;
m_window = win;
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel;
m_window = win;
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel;
m_data = &data;
m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
m_data = &data;
m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
{
// if (m_data) delete m_data;
}
{
// if (m_data) delete m_data;
}
wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )
{
// wxASSERT_MSG( m_data, "wxDragSource: no data" );
wxDragResult wxDropSource::DoDragDrop( int WXUNUSED(flags) )
{
// wxASSERT_MSG( m_data, "wxDragSource: no data" );
#if 0
if (!m_data) return (wxDragResult) wxDragNone;
if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
#if 0
if (!m_data) return (wxDragResult) wxDragNone;
if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone;
g_blockEventsOnDrag = false;
g_blockEventsOnDrag = false;
return m_retValue;
#endif
}
return m_retValue;
#endif
}
if (!m_data) return;
wxString formats;
if (!m_data) return;
wxString formats;
wxDataFormat df = m_data->GetPreferredFormat();
wxDataFormat df = m_data->GetPreferredFormat();
case wxDF_FILENAME:
formats += "file:ALL";
case wxDF_FILENAME:
formats += "file:ALL";
char *str = WXSTRINGCAST formats;
char *str = WXSTRINGCAST formats;
// TODO
}
void wxDropSource::UnregisterWindow(void)
{
if (!m_widget) return;
// TODO
}
void wxDropSource::UnregisterWindow(void)
{
if (!m_widget) return;
{
m_id = wxTheApp->GetAppName();
}
{
m_id = wxTheApp->GetAppName();
}
size_t wxPrivateDropTarget::GetFormatCount() const
{
return 1;
size_t wxPrivateDropTarget::GetFormatCount() const
{
return 1;
#define XtDisplay XTDISPLAY
#endif
#define XtDisplay XTDISPLAY
#endif
#include "wx/utils.h"
#include "wx/apptrait.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/apptrait.h"
#include "wx/app.h"
#define XtScreen XTSCREEN
#endif
#define XtScreen XTSCREEN
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
GetSize(& width1, & height1);
if (keepOriginalSize && (width != width1 || height != height1))
{
GetSize(& width1, & height1);
if (keepOriginalSize && (width != width1 || height != height1))
{
- SetSize(-1, -1, width, height);
+ SetSize(wxDefaultCoord, wxDefaultCoord, width, height);