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

resolving conflicts in files I had forgot to commit (sorry)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-08 22:04:51 +00:00
parent 5a30d45018
commit a6c811617b
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/msw/listctrl.h
View File

@@ -342,9 +342,6 @@ public:
// bring the control in sync with current m_windowStyle value // bring the control in sync with current m_windowStyle value
void UpdateStyle(); void UpdateStyle();
// Gets the WIN32 style and extra style
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ;
// Event handlers // Event handlers
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Necessary for drawing hrules and vrules, if specified // Necessary for drawing hrules and vrules, if specified
@@ -362,6 +359,10 @@ protected:
// free memory taken by all internal data // free memory taken by all internal data
void FreeAllInternalData(); 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 wxTextCtrl* m_textCtrl; // The control used for editing a label
wxImageList * m_imageListNormal; // The image list for normal icons wxImageList * m_imageListNormal; // The image list for normal icons
wxImageList * m_imageListSmall; // The image list for small icons wxImageList * m_imageListSmall; // The image list for small icons
@@ -370,7 +371,6 @@ protected:
m_ownsImageListSmall, m_ownsImageListSmall,
m_ownsImageListState; m_ownsImageListState;
long m_baseStyle; // Basic Windows style flags, for recreation purposes
int m_colCount; // Windows doesn't have GetColumnCount so must int m_colCount; // Windows doesn't have GetColumnCount so must
// keep track of inserted/deleted columns // keep track of inserted/deleted columns
long m_count; // Keep track of item count to save calls to long m_count; // Keep track of item count to save calls to
@@ -396,8 +396,6 @@ protected:
virtual wxListItemAttr *OnGetItemAttr(long item) const; virtual wxListItemAttr *OnGetItemAttr(long item) const;
private: private:
bool DoCreateControl(int x, int y, int w, int h);
// process NM_CUSTOMDRAW notification message // process NM_CUSTOMDRAW notification message
WXLPARAM OnCustomDraw(WXLPARAM lParam); WXLPARAM OnCustomDraw(WXLPARAM lParam);

2
src/msw/pen.cpp
View File

@@ -31,7 +31,7 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
int wx2msPenStyle(int wx_style); static int wx2msPenStyle(int wx_style);
IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)