git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42046
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
26 files changed:
// Author: Jonathan Bayer
// Modified by:
// Created:
// Author: Jonathan Bayer
// Modified by:
// Created:
// Copyright: (c) Jonathan Bayer
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Jonathan Bayer
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Modified by:
// Created: Aug-31-2006
// Copyright: (c) Jaakko Salli
// Modified by:
// Created: Aug-31-2006
// Copyright: (c) Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Name: wx/cocoa/ObjcAssociate.h
// Purpose: Associates an Objective-C class with a C++ class
// Author: David Elliott
// Name: wx/cocoa/ObjcAssociate.h
// Purpose: Associates an Objective-C class with a C++ class
// Author: David Elliott
// Copyright: (c) 2002 David Elliott <dfe@cox.net>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2002 David Elliott <dfe@cox.net>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
}
#endif // __WX_COCOA_OBJC_ASSOCIATE_H__
}
#endif // __WX_COCOA_OBJC_ASSOCIATE_H__
// Name: wx/cocoa/ObjcPose.h
// Purpose: Macros for initializing poseAs, among other things
// Author: David Elliott
// Name: wx/cocoa/ObjcPose.h
// Purpose: Macros for initializing poseAs, among other things
// Author: David Elliott
// Copyright: (c) 2002 David Elliott <dfe@cox.net>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2002 David Elliott <dfe@cox.net>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
class wxPoseAsInitializer
{
public:
class wxPoseAsInitializer
{
public:
- wxPoseAsInitializer()
- : m_next(sm_first)
- {
- sm_first = this;
- }
- virtual ~wxPoseAsInitializer()
- {
- sm_first = m_next;
- }
- static void InitializePosers()
- {
- while(sm_first)
- {
- delete sm_first;
- }
- };
+ wxPoseAsInitializer()
+ : m_next(sm_first)
+ {
+ sm_first = this;
+ }
+ virtual ~wxPoseAsInitializer()
+ {
+ sm_first = m_next;
+ }
+ static void InitializePosers()
+ {
+ while(sm_first)
+ {
+ delete sm_first;
+ }
+ };
- wxPoseAsInitializer *m_next;
- static wxPoseAsInitializer *sm_first;
+ wxPoseAsInitializer *m_next;
+ static wxPoseAsInitializer *sm_first;
};
class wxDummyForPoseAsInitializer
{
public:
};
class wxDummyForPoseAsInitializer
{
public:
- wxDummyForPoseAsInitializer(void*) {}
+ wxDummyForPoseAsInitializer(void*) {}
};
#define WX_IMPLEMENT_POSER(poser) \
};
#define WX_IMPLEMENT_POSER(poser) \
#endif // __OBJC__
#endif // __WX_COCOA_PRIVATE_POSER_H__
#endif // __OBJC__
#endif // __WX_COCOA_PRIVATE_POSER_H__
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_BMPBUTTN_H__
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_BMPBUTTN_H__
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_DCSCREEN_H__
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_DCSCREEN_H__
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
-class WXDLLEXPORT wxFrame: public wxFrameBase
+class WXDLLEXPORT wxFrame: public wxFrameBase
{
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
{
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
#if wxUSE_TOOLBAR
// create main toolbar bycalling OnCreateToolBar()
virtual wxToolBar* CreateToolBar(long style = -1,
#if wxUSE_TOOLBAR
// create main toolbar bycalling OnCreateToolBar()
virtual wxToolBar* CreateToolBar(long style = -1,
+ wxWindowID winid = wxID_ANY,
const wxString& name = wxToolBarNameStr);
// sets the main tool bar
virtual void SetToolBar(wxToolBar *toolbar);
const wxString& name = wxToolBarNameStr);
// sets the main tool bar
virtual void SetToolBar(wxToolBar *toolbar);
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
// Copyright: (c) 2003 David Elliott
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_RADIOBUT_H__
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_RADIOBUT_H__
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_STATBMP_H__
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_STATBMP_H__
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
// Copyright: (c) 2003 David Elliott
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_STATBOX_H__
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_STATBOX_H__
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
// Copyright: (c) 2003 David Elliott
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_STATLINE_H__
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_STATLINE_H__
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Author: Jaakko Salli
// Modified by:
// Created: Aug-30-2006
// Author: Jaakko Salli
// Modified by:
// Created: Aug-30-2006
// Copyright: (c) Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: wx/mac/carbon/private/print.h
// Purpose: private implementation for printing on MacOS
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// Purpose: private implementation for printing on MacOS
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: wx/mac/carbon/uma.h
// Purpose: Universal MacOS API
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// Purpose: Universal MacOS API
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: wx/mac/classic/uma.h
// Purpose: Universal MacOS API
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// Purpose: Universal MacOS API
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Purpose: XML resource handler for wxBitmapComboBox
// Author: Jaakko Salli
// Created: Sep-10-2006
// Purpose: XML resource handler for wxBitmapComboBox
// Author: Jaakko Salli
// Created: Sep-10-2006
// Copyright: (c) 2006 Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2006 Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSPanel.mm
+// Name: src/cocoa/NSPanel.mm
// Purpose: wxCocoaNSPanel
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Purpose: wxCocoaNSPanel
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
// globals
// ----------------------------------------------------------------------------
WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSPanel)
// globals
// ----------------------------------------------------------------------------
WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSPanel)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSWindow.mm
+// Name: src/cocoa/NSWindow.mm
// Purpose: wxCocoaNSWindow
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Purpose: wxCocoaNSWindow
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
}
@end // implementation wxPoserNSWindow
}
@end // implementation wxPoserNSWindow
// Author: David Elliott
// Modified by:
// Created: 2002/12/15
// Author: David Elliott
// Modified by:
// Created: 2002/12/15
// Copyright: 2002 David Elliott
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: 2002 David Elliott
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
SetReturnCode(retCode);
Show(false);
}
SetReturnCode(retCode);
Show(false);
}
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
// Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
// Author: David Elliott
// Modified by:
// Created: 2002/11/11
// Author: David Elliott
// Modified by:
// Created: 2002/11/11
// Copyright: (c) 2002 David Elliott
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2002 David Elliott
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// Author: Jaakko Salli
// Modified by:
// Created: Aug-31-2006
// Author: Jaakko Salli
// Modified by:
// Created: Aug-31-2006
// Copyright: (c) 2005 Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2005 Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Purpose: XRC resource for wxBitmapComboBox
// Author: Jaakko Salli
// Created: Sep-10-2006
// Purpose: XRC resource for wxBitmapComboBox
// Author: Jaakko Salli
// Created: Sep-10-2006
// Copyright: (c) 2006 Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 2006 Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////