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

fixed compilation for wxMSW after the recent changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-25 23:14:33 +00:00
parent 065722d7b1
commit a3399e6cbe
4 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/msw/tbar95.h
View File

@@ -81,12 +81,13 @@ protected:
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
virtual wxToolBarToolBase *CreateTool(int id, virtual wxToolBarToolBase *CreateTool(int id,
const wxBitmap& bitmap1, const wxString& label,
const wxBitmap& bitmap2, const wxBitmap& bmpNormal,
bool toggle, const wxBitmap& bmpDisabled,
wxItemKind kind,
wxObject *clientData, wxObject *clientData,
const wxString& shortHelpString, const wxString& shortHelp,
const wxString& longHelpString); const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control); virtual wxToolBarToolBase *CreateTool(wxControl *control);
// should be called whenever the toolbar size changes // should be called whenever the toolbar size changes

11
include/wx/msw/tbarmsw.h
View File

@@ -90,12 +90,13 @@ protected:
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
virtual wxToolBarToolBase *CreateTool(int id, virtual wxToolBarToolBase *CreateTool(int id,
const wxBitmap& bitmap1, const wxString& label,
const wxBitmap& bitmap2, const wxBitmap& bmpNormal,
bool toggle, const wxBitmap& bmpDisabled,
wxItemKind kind,
wxObject *clientData, wxObject *clientData,
const wxString& shortHelpString, const wxString& shortHelp,
const wxString& longHelpString); const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control); virtual wxToolBarToolBase *CreateTool(wxControl *control);
void DoRedrawTool(wxToolBarToolBase *tool); void DoRedrawTool(wxToolBarToolBase *tool);

45
src/msw/tbar95.cpp
View File

@@ -101,6 +101,10 @@
#define TBSTYLE_TRANSPARENT 0x8000 #define TBSTYLE_TRANSPARENT 0x8000
#endif #endif
#ifndef TBSTYLE_TOOLTIPS
#define TBSTYLE_TOOLTIPS 0x0100
#endif
// Messages // Messages
#ifndef TB_GETSTYLE #ifndef TB_GETSTYLE
#define TB_SETSTYLE (WM_USER + 56) #define TB_SETSTYLE (WM_USER + 56)
@@ -138,14 +142,15 @@ class wxToolBarTool : public wxToolBarToolBase
public: public:
wxToolBarTool(wxToolBar *tbar, wxToolBarTool(wxToolBar *tbar,
int id, int id,
const wxBitmap& bitmap1, const wxString& label,
const wxBitmap& bitmap2, const wxBitmap& bmpNormal,
bool toggle, const wxBitmap& bmpDisabled,
wxItemKind kind,
wxObject *clientData, wxObject *clientData,
const wxString& shortHelpString, const wxString& shortHelp,
const wxString& longHelpString) const wxString& longHelp)
: wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle, : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
clientData, shortHelpString, longHelpString) clientData, shortHelp, longHelp)
{ {
m_nSepCount = 0; m_nSepCount = 0;
} }
@@ -175,15 +180,16 @@ private:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxToolBarToolBase *wxToolBar::CreateTool(int id, wxToolBarToolBase *wxToolBar::CreateTool(int id,
const wxBitmap& bitmap1, const wxString& label,
const wxBitmap& bitmap2, const wxBitmap& bmpNormal,
bool toggle, const wxBitmap& bmpDisabled,
wxItemKind kind,
wxObject *clientData, wxObject *clientData,
const wxString& shortHelpString, const wxString& shortHelp,
const wxString& longHelpString) const wxString& longHelp)
{ {
return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle, return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
clientData, shortHelpString, longHelpString); clientData, shortHelp, longHelp);
} }
wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
@@ -224,16 +230,12 @@ bool wxToolBar::Create(wxWindow *parent,
return FALSE; return FALSE;
// prepare flags // prepare flags
DWORD msflags = 0; // WS_VISIBLE | WS_CHILD always included DWORD msflags = TBSTYLE_TOOLTIPS; // WS_VISIBLE | WS_CHILD always included
if ( style & wxCLIP_SIBLINGS ) if ( style & wxCLIP_SIBLINGS )
msflags |= WS_CLIPSIBLINGS; msflags |= WS_CLIPSIBLINGS;
#ifdef TBSTYLE_TOOLTIPS if ( style & wxTB_FLAT )
msflags |= TBSTYLE_TOOLTIPS;
#endif
if (style & wxTB_FLAT)
{ {
// static as it doesn't change during the program lifetime // static as it doesn't change during the program lifetime
static int s_verComCtl = wxTheApp->GetComCtl32Version(); static int s_verComCtl = wxTheApp->GetComCtl32Version();
@@ -607,8 +609,7 @@ bool wxToolBar::Realize()
i++; i++;
} }
if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)buttons) )
(WPARAM)i, (LPARAM)buttons) )
{ {
wxLogLastError(wxT("TB_ADDBUTTONS")); wxLogLastError(wxT("TB_ADDBUTTONS"));
} }

31
src/msw/tbarmsw.cpp
View File

@@ -83,14 +83,14 @@ class WXDLLEXPORT wxToolBarTool : public wxToolBarToolBase
public: public:
wxToolBarTool(wxToolBar *tbar, wxToolBarTool(wxToolBar *tbar,
int id, int id,
const wxBitmap& bitmap1, const wxBitmap& bmpNormal,
const wxBitmap& bitmap2, const wxBitmap& bmpDisabled,
bool toggle, bool toggle,
wxObject *clientData, wxObject *clientData,
const wxString& shortHelpString, const wxString& shortHelp,
const wxString& longHelpString) const wxString& longHelp)
: wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle, : wxToolBarToolBase(tbar, id, bmpNormal, bmpDisabled, toggle,
clientData, shortHelpString, longHelpString) clientData, shortHelp, longHelp)
{ {
} }
@@ -136,15 +136,16 @@ END_EVENT_TABLE()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxToolBarToolBase *wxToolBar::CreateTool(int id, wxToolBarToolBase *wxToolBar::CreateTool(int id,
const wxBitmap& bitmap1, const wxString& label,
const wxBitmap& bitmap2, const wxBitmap& bmpNormal,
bool toggle, const wxBitmap& bmpDisabled,
wxItemKind kind,
wxObject *clientData, wxObject *clientData,
const wxString& shortHelpString, const wxString& shortHelp,
const wxString& longHelpString) const wxString& longHelp)
{ {
return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle, return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
clientData, shortHelpString, longHelpString); clientData, shortHelp, longHelp);
} }
wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
@@ -490,7 +491,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
// TODO: use the mapping code from wxToolBar95 to get it right in this class // TODO: use the mapping code from wxToolBar95 to get it right in this class
#if !defined(__WIN32__) && !defined(__WIN386__) #if !defined(__WIN32__) && !defined(__WIN386__)
wxBitmap bitmap2; wxBitmap bmpDisabled;
if (tool->CanBeToggled()) if (tool->CanBeToggled())
{ {
HBITMAP hbmp = CreateMappedBitmap((WXHINSTANCE)wxGetInstance(), HBITMAP hbmp = CreateMappedBitmap((WXHINSTANCE)wxGetInstance(),
@@ -784,7 +785,7 @@ void wxToolBar::DrawButton(WXHDC hdc, int x, int y, int dx, int dy,
dxFace -= 3; dxFace -= 3;
dyFace -= 3; dyFace -= 3;
// Using bitmap2 can cause problems (don't know why!) // Using bmpDisabled can cause problems (don't know why!)
#if !defined(__WIN32__) && !defined(__WIN386__) #if !defined(__WIN32__) && !defined(__WIN386__)
HBITMAP bitmapOld; HBITMAP bitmapOld;
if (tool->GetBitmap2().Ok()) if (tool->GetBitmap2().Ok())