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

merging back XTI branch part 2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-01-04 08:31:53 +00:00
parent f0c6b96336
commit 2895324520
244 changed files with 4364 additions and 5859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/os2/bmpbuttn.cpp
View File

@@ -23,8 +23,6 @@
#include "wx/os2/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
bool wxBitmapButton::Create( wxWindow* pParent,

2
src/os2/button.cpp
View File

@@ -39,8 +39,6 @@
#define BST_CHECKED 0x0001
#endif
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
// Button
bool wxButton::Create( wxWindow* pParent,

1
src/os2/checkbox.cpp
View File

@@ -27,7 +27,6 @@
// macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
extern void wxAssociateWinWithHandle( HWND hWnd

2
src/os2/choice.cpp
View File

@@ -24,8 +24,6 @@
#include "wx/os2/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
bool wxChoice::Create(
wxWindow* pParent
, wxWindowID vId

2
src/os2/colour.cpp
View File

@@ -22,8 +22,6 @@
#define INCL_PM
#include<os2.h>
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
// Colour
void wxColour::Init()

2
src/os2/combobox.cpp
View File

@@ -35,8 +35,6 @@ MRESULT EXPENTRY wxComboEditWndProc( HWND hWnd
//
static WXFARPROC gfnWndprocEdit = (WXFARPROC)NULL;
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
{
long lSel = GetSelection();

1
src/os2/dialog.cpp
View File

@@ -33,7 +33,6 @@
#define wxDIALOG_DEFAULT_WIDTH 500
#define wxDIALOG_DEFAULT_HEIGHT 500
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
// ----------------------------------------------------------------------------
// wxDialogModalData

2
src/os2/frame.cpp
View File

@@ -52,8 +52,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
// ============================================================================
// implementation
// ============================================================================

2
src/os2/gauge.cpp
View File

@@ -27,8 +27,6 @@ extern void wxAssociateWinWithHandle( HWND hWnd
,wxWindowOS2* pWin
);
IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxGaugeBase)
MRESULT EXPENTRY wxGaugeWndProc( HWND hWnd,
UINT uMessage,
MPARAM wParam,

2
src/os2/listbox.cpp
View File

@@ -39,8 +39,6 @@
#include "wx/ownerdrw.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
// ============================================================================
// list box item declaration and implementation
// ============================================================================

7
src/os2/listctrl.cpp
View File

@@ -773,13 +773,6 @@ void ConvertToOS2ListCol (
pField->offStruct = 0;
} // end of ConvertToOS2ListCol
IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
EVT_PAINT(wxListCtrl::OnPaint)
END_EVENT_TABLE()

2
src/os2/radiobut.cpp
View File

@@ -27,8 +27,6 @@
#include "wx/os2/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
extern void wxAssociateWinWithHandle( HWND hWnd
,wxWindowOS2* pWin
);

2
src/os2/scrolbar.cpp
View File

@@ -20,8 +20,6 @@
#include "wx/os2/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
// Scrollbar
bool wxScrollBar::Create(wxWindow* pParent,
wxWindowID vId,

2
src/os2/slider.cpp
View File

@@ -28,8 +28,6 @@
#include "wx/slider.h"
#include "wx/os2/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
wxSlider::wxSlider()
{
m_hStaticValue = 0L;

4
src/os2/spinbutt.cpp
View File

@@ -28,8 +28,6 @@ extern void wxAssociateWinWithHandle( HWND hWnd
,wxWindowOS2* pWin
);
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
#include "wx/os2/private.h"
// ============================================================================
@@ -40,8 +38,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
// wxWin macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
bool wxSpinButton::Create(
wxWindow* pParent
, wxWindowID vId

2
src/os2/spinctrl.cpp
View File

@@ -40,8 +40,6 @@ extern void wxAssociateWinWithHandle( HWND hWnd
static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL;
wxArraySpins wxSpinCtrl::m_svAllSpins;
IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
EVT_CHAR(wxSpinCtrl::OnChar)
EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange)

2
src/os2/statbmp.cpp
View File

@@ -28,8 +28,6 @@
// macros
// ---------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
BEGIN_EVENT_TABLE(wxStaticBitmap, wxWindow)
EVT_PAINT(wxStaticBitmap::OnPaint)
END_EVENT_TABLE()

2
src/os2/statbox.cpp
View File

@@ -22,8 +22,6 @@
#include "wx/os2/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
bool wxStaticBox::Create( wxWindow* pParent,
wxWindowID vId,
const wxString& rsLabel,

2
src/os2/statline.cpp
View File

@@ -33,8 +33,6 @@
// implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
// ----------------------------------------------------------------------------
// wxStaticLine
// ----------------------------------------------------------------------------

2
src/os2/stattext.cpp
View File

@@ -24,8 +24,6 @@
#include "wx/os2/private.h"
#include <stdio.h>
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
bool wxStaticText::Create( wxWindow* pParent,
wxWindowID vId,
const wxString& rsLabel,

2
src/os2/textctrl.cpp
View File

@@ -55,8 +55,6 @@
// event tables and other macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)

2
src/os2/treectrl.cpp
View File

@@ -254,8 +254,6 @@ private:
// wxWin macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------

4
src/os2/window.cpp
View File

@@ -170,9 +170,7 @@ static wxWindow* gpWinBeingCreated = NULL;
// method
#ifdef __WXUNIVERSAL__
IMPLEMENT_ABSTRACT_CLASS(wxWindowOS2, wxWindowBase)
#else // __WXPM__
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
#endif // __WXUNIVERSAL__/__WXPM__
#endif // __WXUNIVERSAL__
BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase)
EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground)