MSW and source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
// Author: William Osborne
|
||||
// Modified by:
|
||||
// Created: 10/13/04
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) William Osborne
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -47,7 +47,7 @@ wxBEGIN_FLAGS( wxBitmapButtonStyle )
|
||||
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
||||
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
||||
wxFLAGS_MEMBER(wxBORDER_NONE)
|
||||
|
||||
|
||||
// old style border flags
|
||||
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
||||
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
||||
@@ -102,11 +102,6 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
|
||||
|
||||
#define FOCUS_MARGIN 3
|
||||
|
||||
bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
|
||||
int right, int bottom, bool sel )
|
||||
{
|
||||
|
@@ -4,7 +4,7 @@
|
||||
// Author: William Osborne
|
||||
// Modified by:
|
||||
// Created: 10.13.04
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) William Osborne
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -40,7 +40,6 @@
|
||||
#include "wx/settings.h"
|
||||
#endif
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/intl.h"
|
||||
#include "wx/frame.h"
|
||||
|
@@ -4,7 +4,7 @@
|
||||
// Author: William Osborne
|
||||
// Modified by:
|
||||
// Created: 10/13/04
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) William Osborne
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -27,7 +27,6 @@
|
||||
#if wxUSE_HELP
|
||||
|
||||
#include "wx/filefn.h"
|
||||
#include "wx/msw/helpwin.h"
|
||||
|
||||
#include <time.h>
|
||||
|
||||
|
@@ -4,7 +4,7 @@
|
||||
// Author: William Osborne
|
||||
// Modified by:
|
||||
// Created: 10/13/04
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) William Osborne
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -94,7 +94,7 @@ wxBEGIN_FLAGS( wxListCtrlStyle )
|
||||
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
||||
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
||||
wxFLAGS_MEMBER(wxBORDER_NONE)
|
||||
|
||||
|
||||
// old style border flags
|
||||
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
||||
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
||||
@@ -133,7 +133,7 @@ wxEND_FLAGS( wxListCtrlStyle )
|
||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h")
|
||||
|
||||
wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
|
||||
wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
|
||||
wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
|
||||
|
||||
wxPROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
||||
wxEND_PROPERTIES_TABLE()
|
||||
@@ -141,7 +141,7 @@ wxEND_PROPERTIES_TABLE()
|
||||
wxBEGIN_HANDLERS_TABLE(wxListCtrl)
|
||||
wxEND_HANDLERS_TABLE()
|
||||
|
||||
wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
|
||||
wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
|
||||
|
||||
/*
|
||||
TODO : Expose more information of a list's layout etc. via appropriate objects (<28> la NotebookPageInfo)
|
||||
@@ -182,11 +182,6 @@ bool wxListCtrl::Create(wxWindow *parent,
|
||||
return false;
|
||||
}
|
||||
|
||||
WXDWORD wxListCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void wxListCtrl::UpdateStyle()
|
||||
{
|
||||
}
|
||||
@@ -499,7 +494,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
|
||||
// End label editing, optionally cancelling the edit
|
||||
bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
|
||||
{
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Ensures this item is visible
|
||||
@@ -522,14 +517,14 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
|
||||
// in a wxListItemInternalData structure refernced by the actual lParam
|
||||
long wxListCtrl::FindItem(long start, long data)
|
||||
{
|
||||
return -1;
|
||||
return wxNOT_FOUND;
|
||||
}
|
||||
|
||||
// Find an item nearest this position in the specified direction, starting from
|
||||
// the item after 'start' or the beginning if 'start' is -1.
|
||||
long wxListCtrl::FindItem(long start, const wxPoint& pt, int direction)
|
||||
{
|
||||
return -1;
|
||||
return wxNOT_FOUND;
|
||||
}
|
||||
|
||||
// Determines which item (if any) is at the specified point,
|
||||
@@ -581,7 +576,7 @@ long wxListCtrl::InsertColumn(long col,
|
||||
// dx is interpreted as number of columns)
|
||||
bool wxListCtrl::ScrollList(int dx, int dy)
|
||||
{
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Sort items.
|
||||
@@ -622,7 +617,7 @@ int CALLBACK wxInternalDataCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM l
|
||||
|
||||
bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
|
||||
{
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -631,16 +626,6 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
|
||||
// message processing
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// see comment at the end of wxListCtrl::GetColumn()
|
||||
#ifdef NM_CUSTOMDRAW // _WIN32_IE >= 0x0300
|
||||
|
||||
@@ -712,30 +697,5 @@ static void wxDeleteInternalData(wxListCtrl* ctl, long itemId)
|
||||
{
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxWin <-> MSW items conversions
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
static void wxConvertFromMSWListItem(HWND hwndListCtrl,
|
||||
wxListItem& info,
|
||||
LV_ITEM& lvItem)
|
||||
{
|
||||
}
|
||||
|
||||
static void wxConvertToMSWFlags(long state, long stateMask, LV_ITEM& lvItem)
|
||||
{
|
||||
}
|
||||
|
||||
static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
|
||||
const wxListItem& info,
|
||||
LV_ITEM& lvItem)
|
||||
{
|
||||
}
|
||||
|
||||
static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item,
|
||||
LV_COLUMN& lvCol)
|
||||
{
|
||||
}
|
||||
|
||||
#endif // wxUSE_LISTCTRL
|
||||
|
||||
|
@@ -4,7 +4,7 @@
|
||||
// Author: William Osborne
|
||||
// Modified by:
|
||||
// Created: 10/13/04
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) William Osborne
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
@@ -4,7 +4,7 @@
|
||||
// Author: William Osborne
|
||||
// Modified by:
|
||||
// Created: 10/13/04
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) William Osborne
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -39,10 +39,6 @@
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
|
||||
|
||||
#if defined(__WIN95__)
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
// ============================================================================
|
||||
@@ -64,7 +60,7 @@ wxBEGIN_FLAGS( wxSpinButtonStyle )
|
||||
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
||||
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
||||
wxFLAGS_MEMBER(wxBORDER_NONE)
|
||||
|
||||
|
||||
// old style border flags
|
||||
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
||||
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
||||
@@ -104,7 +100,7 @@ wxEND_PROPERTIES_TABLE()
|
||||
wxBEGIN_HANDLERS_TABLE(wxSpinButton)
|
||||
wxEND_HANDLERS_TABLE()
|
||||
|
||||
wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
|
||||
wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
|
||||
#else
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
|
||||
#endif
|
||||
@@ -155,24 +151,6 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
|
||||
{
|
||||
}
|
||||
|
||||
bool wxSpinButton::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
|
||||
WXWORD pos, WXHWND control)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool wxSpinButton::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD WXUNUSED(id))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif // __WIN95__
|
||||
|
||||
#endif
|
||||
// wxUSE_SPINCTN
|
||||
|
||||
|
@@ -4,7 +4,7 @@
|
||||
// Author: William Osborne
|
||||
// Modified by:
|
||||
// Created: 10/13/04
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) William Osborne
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -41,8 +41,6 @@
|
||||
#include "wx/dynarray.h"
|
||||
#include "wx/imaglist.h"
|
||||
#include "wx/settings.h"
|
||||
#include "wx/msw/treectrl.h"
|
||||
#include "wx/msw/dragimag.h"
|
||||
|
||||
#include "wx/palmos/wrapcctl.h"
|
||||
|
||||
@@ -716,26 +714,6 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
|
||||
}
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
// process WM_NOTIFY Windows message
|
||||
bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// State control.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -1,10 +1,10 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: palmos/utilsexec.cpp
|
||||
// Purpose: wxExecute implementation for MSW
|
||||
// Purpose: wxExecute implementation for PalmOS
|
||||
// Author: William Osborne
|
||||
// Modified by:
|
||||
// Created: 10/13/04
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) William Osborne
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
@@ -4,7 +4,7 @@
|
||||
// Author: William Osborne
|
||||
// Modified by:
|
||||
// Created: 10/13/04
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id:
|
||||
// Copyright: (c) William Osborne
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
Reference in New Issue
Block a user