From 5445a26cc480e03c4dcf2ba54b0881e1fa9330e5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Mon, 27 Dec 2004 08:36:21 +0000
Subject: [PATCH] MSW and source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/palmos/apptbase.h | 4 +--
include/wx/palmos/apptrait.h | 8 ++---
include/wx/palmos/bmpbuttn.h | 5 ++--
include/wx/palmos/listctrl.h | 22 +++++---------
include/wx/palmos/spinbutt.h | 12 ++------
include/wx/palmos/treectrl.h | 32 ++++++++------------
src/palmos/bmpbuttn.cpp | 9 ++----
src/palmos/dragimag.cpp | 3 +-
src/palmos/help.cpp | 3 +-
src/palmos/listctrl.cpp | 58 ++++++------------------------------
src/palmos/settings.cpp | 2 +-
src/palmos/spinbutt.cpp | 28 ++---------------
src/palmos/treectrl.cpp | 24 +--------------
src/palmos/utilsexc.cpp | 4 +--
src/palmos/utilsgui.cpp | 2 +-
15 files changed, 52 insertions(+), 164 deletions(-)
diff --git a/include/wx/palmos/apptbase.h b/include/wx/palmos/apptbase.h
index 404c417894..14c3485d78 100644
--- a/include/wx/palmos/apptbase.h
+++ b/include/wx/palmos/apptbase.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
///////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,7 @@
#define _WX_PALMOS_APPTBASE_H_
// ----------------------------------------------------------------------------
-// wxAppTraits: the MSW version adds extra hooks needed by MSW-only code
+// wxAppTraits
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
diff --git a/include/wx/palmos/apptrait.h b/include/wx/palmos/apptrait.h
index 24e0ef34a6..0900044c1b 100644
--- a/include/wx/palmos/apptrait.h
+++ b/include/wx/palmos/apptrait.h
@@ -4,13 +4,13 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
-// RCS-ID: $Id:
+// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_MSW_APPTRAIT_H_
-#define _WX_MSW_APPTRAIT_H_
+#ifndef _WX_PALM_APPTRAIT_H_
+#define _WX_PALM_APPTRAIT_H_
// ----------------------------------------------------------------------------
// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
@@ -41,5 +41,5 @@ public:
#endif // wxUSE_GUI
-#endif // _WX_MSW_APPTRAIT_H_
+#endif // _WX_PALM_APPTRAIT_H_
diff --git a/include/wx/palmos/bmpbuttn.h b/include/wx/palmos/bmpbuttn.h
index 0cdd4e03f3..1de213b719 100644
--- a/include/wx/palmos/bmpbuttn.h
+++ b/include/wx/palmos/bmpbuttn.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
/////////////////////////////////////////////////////////////////////////////
@@ -49,14 +49,13 @@ public:
// Implementation
virtual void SetDefault();
- virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
protected:
virtual wxSize DoGetBestSize() const;
-
+
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
};
diff --git a/include/wx/palmos/listctrl.h b/include/wx/palmos/listctrl.h
index 50168fb9b0..19a6725883 100644
--- a/include/wx/palmos/listctrl.h
+++ b/include/wx/palmos/listctrl.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
/////////////////////////////////////////////////////////////////////////////
@@ -90,7 +90,7 @@ public:
wxListCtrl() { Init(); }
wxListCtrl(wxWindow *parent,
- wxWindowID id = -1,
+ wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLC_ICON,
@@ -105,7 +105,7 @@ public:
virtual ~wxListCtrl();
bool Create(wxWindow *parent,
- wxWindowID id = -1,
+ wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLC_ICON,
@@ -214,7 +214,7 @@ public:
long GetTopItem() const ;
// Add or remove a single window style
- void SetSingleStyle(long style, bool add = TRUE) ;
+ void SetSingleStyle(long style, bool add = true) ;
// Set the whole window style
void SetWindowStyleFlag(long style) ;
@@ -280,7 +280,7 @@ public:
// Find an item whose label matches this string, starting from the item after 'start'
// or the beginning if 'start' is -1.
- long FindItem(long start, const wxString& str, bool partial = FALSE);
+ long FindItem(long start, const wxString& str, bool partial = false);
// Find an item whose data matches this data, starting from the item after 'start'
// or the beginning if 'start' is -1.
@@ -338,10 +338,6 @@ public:
// data is arbitrary data to be passed to the sort function.
bool SortItems(wxListCtrlCompare fn, long data);
- // IMPLEMENTATION
- virtual bool MSWCommand(WXUINT param, WXWORD id);
- virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
// bring the control in sync with current m_windowStyle value
void UpdateStyle();
@@ -372,10 +368,6 @@ protected:
// free memory taken by all internal data
void FreeAllInternalData();
- // convert our styles to Windows
- virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-
-
wxTextCtrl* m_textCtrl; // The control used for editing a label
wxImageList * m_imageListNormal; // The image list for normal icons
wxImageList * m_imageListSmall; // The image list for small icons
@@ -390,10 +382,10 @@ protected:
// ListView_GetItemCount
bool m_ignoreChangeMessages;
- // TRUE if we have any internal data (user data & attributes)
+ // true if we have any internal data (user data & attributes)
bool m_AnyInternalData;
- // TRUE if we have any items with custom attributes
+ // true if we have any items with custom attributes
bool m_hasAnyAttr;
// these functions are only used for virtual list view controls, i.e. the
diff --git a/include/wx/palmos/spinbutt.h b/include/wx/palmos/spinbutt.h
index 6e1931bfa3..1d9fc485a0 100644
--- a/include/wx/palmos/spinbutt.h
+++ b/include/wx/palmos/spinbutt.h
@@ -26,7 +26,7 @@ public:
wxSpinButton() { }
wxSpinButton(wxWindow *parent,
- wxWindowID id = -1,
+ wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
@@ -38,7 +38,7 @@ public:
virtual ~wxSpinButton();
bool Create(wxWindow *parent,
- wxWindowID id = -1,
+ wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
@@ -50,14 +50,8 @@ public:
virtual void SetValue(int val);
virtual void SetRange(int minVal, int maxVal);
- // implementation
- virtual bool MSWCommand(WXUINT param, WXWORD id);
- virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
- virtual bool MSWOnScroll(int orientation, WXWORD wParam,
- WXWORD pos, WXHWND control);
-
// a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
- virtual bool AcceptsFocus() const { return FALSE; }
+ virtual bool AcceptsFocus() const { return false; }
protected:
virtual wxSize DoGetBestSize() const;
diff --git a/include/wx/palmos/treectrl.h b/include/wx/palmos/treectrl.h
index 09811d6c0c..36dedc2a06 100644
--- a/include/wx/palmos/treectrl.h
+++ b/include/wx/palmos/treectrl.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
/////////////////////////////////////////////////////////////////////////////
@@ -69,7 +69,7 @@ public:
// --------
wxTreeCtrl() { Init(); }
- wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
+ wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
@@ -81,7 +81,7 @@ public:
virtual ~wxTreeCtrl();
- bool Create(wxWindow *parent, wxWindowID id = -1,
+ bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
@@ -101,7 +101,6 @@ public:
void SetIndent(unsigned int indent);
// spacing is the number of pixels between the start and the Text
- // not implemented under wxMSW
unsigned int GetSpacing() const { return 18; } // return wxGTK default
void SetSpacing(unsigned int WXUNUSED(spacing)) { }
@@ -163,13 +162,13 @@ public:
// allow the user to expand the items which don't have any children now
// - but instead add them only when needed, thus minimizing memory
// usage and loading time.
- void SetItemHasChildren(const wxTreeItemId& item, bool has = TRUE);
+ void SetItemHasChildren(const wxTreeItemId& item, bool has = true);
// the item will be shown in bold
- void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
+ void SetItemBold(const wxTreeItemId& item, bool bold = true);
// the item will be shown with a drop highlight
- void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = TRUE);
+ void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true);
// set the items text colour
void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
@@ -197,15 +196,15 @@ public:
// number of children
// ------------------
- // if 'recursively' is FALSE, only immediate children count, otherwise
+ // if 'recursively' is false, only immediate children count, otherwise
// the returned number is the number of all items in this branch
size_t GetChildrenCount(const wxTreeItemId& item,
- bool recursively = TRUE) const;
+ bool recursively = true) const;
// navigation
// ----------
- // wxTreeItemId.IsOk() will return FALSE if there is no such item
+ // wxTreeItemId.IsOk() will return false if there is no such item
// get the root tree item
wxTreeItemId GetRootItem() const;
@@ -340,7 +339,7 @@ public:
// edited simultaneously)
wxTextCtrl* GetEditControl() const;
// end editing and accept or discard the changes to item label
- void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE);
+ void EndEditLabel(const wxTreeItemId& item, bool discardChanges = false);
// sorting
// this function is called to compare 2 items and should return -1, 0
@@ -371,7 +370,7 @@ public:
// get the bounding rectangle of the item (or of its label only)
bool GetBoundingRect(const wxTreeItemId& item,
wxRect& rect,
- bool textOnly = FALSE) const;
+ bool textOnly = false) const;
// deprecated
// ----------
@@ -422,18 +421,13 @@ public:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
- virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
- virtual bool MSWCommand(WXUINT param, WXWORD id);
- virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
// override some base class virtuals
virtual bool SetBackgroundColour(const wxColour &colour);
virtual bool SetForegroundColour(const wxColour &colour);
// get/set the check state for the item (only for wxTR_MULTIPLE)
bool IsItemChecked(const wxTreeItemId& item) const;
- void SetItemCheck(const wxTreeItemId& item, bool check = TRUE);
+ void SetItemCheck(const wxTreeItemId& item, bool check = true);
// set/get the item state.image (state == -1 means cycle to the next one)
void SetState(const wxTreeItemId& node, int state);
@@ -487,7 +481,7 @@ private:
// the hash storing the items attributes (indexed by item ids)
wxMapTreeAttr m_attrs;
- // TRUE if the hash above is not empty
+ // true if the hash above is not empty
bool m_hasAnyAttr;
// used for dragging
diff --git a/src/palmos/bmpbuttn.cpp b/src/palmos/bmpbuttn.cpp
index 8290018f66..74b261be02 100644
--- a/src/palmos/bmpbuttn.cpp
+++ b/src/palmos/bmpbuttn.cpp
@@ -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 )
{
diff --git a/src/palmos/dragimag.cpp b/src/palmos/dragimag.cpp
index 7ae1e34e74..234d0fcc97 100644
--- a/src/palmos/dragimag.cpp
+++ b/src/palmos/dragimag.cpp
@@ -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"
diff --git a/src/palmos/help.cpp b/src/palmos/help.cpp
index b36d28d548..02e0e235ef 100644
--- a/src/palmos/help.cpp
+++ b/src/palmos/help.cpp
@@ -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>
diff --git a/src/palmos/listctrl.cpp b/src/palmos/listctrl.cpp
index ba7bb430fa..1b60979c31 100644
--- a/src/palmos/listctrl.cpp
+++ b/src/palmos/listctrl.cpp
@@ -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 (à 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
diff --git a/src/palmos/settings.cpp b/src/palmos/settings.cpp
index 29414caf5f..67270661ec 100644
--- a/src/palmos/settings.cpp
+++ b/src/palmos/settings.cpp
@@ -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
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/palmos/spinbutt.cpp b/src/palmos/spinbutt.cpp
index e190fe1fe2..1c708e4865 100644
--- a/src/palmos/spinbutt.cpp
+++ b/src/palmos/spinbutt.cpp
@@ -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
diff --git a/src/palmos/treectrl.cpp b/src/palmos/treectrl.cpp
index 5655c5fd66..2927295a77 100644
--- a/src/palmos/treectrl.cpp
+++ b/src/palmos/treectrl.cpp
@@ -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.
// ----------------------------------------------------------------------------
diff --git a/src/palmos/utilsexc.cpp b/src/palmos/utilsexc.cpp
index 943fa3e3ab..5aacdf30a6 100644
--- a/src/palmos/utilsexc.cpp
+++ b/src/palmos/utilsexc.cpp
@@ -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
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/palmos/utilsgui.cpp b/src/palmos/utilsgui.cpp
index 01d1b3d561..196260b064 100644
--- a/src/palmos/utilsgui.cpp
+++ b/src/palmos/utilsgui.cpp
@@ -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
///////////////////////////////////////////////////////////////////////////////
--
2.47.2