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

Removed compile bugs in regconf.cpp, added new toolbar event processing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-24 15:46:52 +00:00
parent a37e883612
commit 6a23cbcede
5 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/msw/makefile.b32
View File

@@ -172,6 +172,7 @@ MSWOBJS = \
$(MSWDIR)\radiobut.obj \
$(MSWDIR)\region.obj \
$(MSWDIR)\registry.obj \
$(MSWDIR)\regconf.obj \
$(MSWDIR)\scrolbar.obj \
$(MSWDIR)\settings.obj \
$(MSWDIR)\slidrmsw.obj \
@@ -342,6 +343,8 @@ $(MSWDIR)\region.obj: $(MSWDIR)\region.$(SRCSUFF)
$(MSWDIR)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF)
$(MSWDIR)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF)
$(MSWDIR)\scrolbar.obj: $(MSWDIR)\scrolbar.$(SRCSUFF)
$(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)

1
src/msw/makefile.g95
View File

@@ -176,6 +176,7 @@ MSWOBJS = \
radiobut.$(OBJSUFF) \
region.$(OBJSUFF) \
registry.$(OBJSUFF) \
regconf.$(OBJSUFF) \
scrolbar.$(OBJSUFF) \
settings.$(OBJSUFF) \
slidrmsw.$(OBJSUFF) \

6
src/msw/makefile.nt
View File

@@ -176,6 +176,7 @@ MSWOBJS = \
$(MSWDIR)\radiobut.obj \
$(MSWDIR)\region.obj \
$(MSWDIR)\registry.obj \
$(MSWDIR)\regconf.obj \
$(MSWDIR)\scrolbar.obj \
$(MSWDIR)\settings.obj \
$(MSWDIR)\slidrmsw.obj \
@@ -562,6 +563,11 @@ $(MSWDIR)/registry.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
<<
$(MSWDIR)/regconf.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
<<
$(MSWDIR)/scrolbar.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@

20
src/msw/regconf.cpp
View File

@@ -140,13 +140,13 @@ void wxRegConfig::SetPath(const wxString& strPath)
#define LOCAL_MASK 0x8000
#define IS_LOCAL_INDEX(l) (((l) & LOCAL_MASK) != 0)
bool wxRegConfig::GetFirstGroup(wxString& str, long& lIndex) const
bool wxRegConfig::GetFirstGroup(wxString& str, long& lIndex)
{
lIndex = 0;
return GetNextGroup(str, lIndex);
}
bool wxRegConfig::GetNextGroup(wxString& str, long& lIndex) const
bool wxRegConfig::GetNextGroup(wxString& str, long& lIndex)
{
// are we already enumerating local entries?
if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) {
@@ -169,13 +169,13 @@ bool wxRegConfig::GetNextGroup(wxString& str, long& lIndex) const
return bOk;
}
bool wxRegConfig::GetFirstEntry(wxString& str, long& lIndex) const
bool wxRegConfig::GetFirstEntry(wxString& str, long& lIndex)
{
lIndex = 0;
return GetNextEntry(str, lIndex);
}
bool wxRegConfig::GetNextEntry(wxString& str, long& lIndex) const
bool wxRegConfig::GetNextEntry(wxString& str, long& lIndex)
{
// are we already enumerating local entries?
if ( m_keyGlobal.IsOpened() && !IS_LOCAL_INDEX(lIndex) ) {
@@ -198,35 +198,35 @@ bool wxRegConfig::GetNextEntry(wxString& str, long& lIndex) const
return bOk;
}
uint wxRegConfig::GetNumberOfEntries() const
uint wxRegConfig::GetNumberOfEntries(bool bRecursive) const
{
uint nEntries = 0;
// dummy vars
wxString str;
long l;
bool bCont = GetFirstEntry(str, l);
bool bCont = ((wxRegConfig*)this)->GetFirstEntry(str, l);
while ( bCont ) {
nEntries++;
bCont = GetNextEntry(str, l);
bCont = ((wxRegConfig*)this)->GetNextEntry(str, l);
}
return nEntries;
}
uint wxRegConfig::GetNumberOfGroups() const
uint wxRegConfig::GetNumberOfGroups(bool bRecursive) const
{
uint nGroups = 0;
// dummy vars
wxString str;
long l;
bool bCont = GetFirstGroup(str, l);
bool bCont = ((wxRegConfig*)this)->GetFirstGroup(str, l);
while ( bCont ) {
nGroups++;
bCont = GetNextGroup(str, l);
bCont = ((wxRegConfig*)this)->GetNextGroup(str, l);
}
return nGroups;

12
src/msw/tbar95.cpp
View File

@@ -45,6 +45,7 @@
#include "wx/app.h"
#include "wx/msw/private.h"
// Styles
#ifndef TBSTYLE_FLAT
#define TBSTYLE_LIST 0x1000
#define TBSTYLE_FLAT 0x0800
@@ -52,6 +53,17 @@
#endif
// use TBSTYLE_TRANSPARENT if you use TBSTYLE_FLAT
// Messages
#ifndef TB_GETSTYLE
#define TB_GETSTYLE (WM_USER + 57)
#define TB_SETSTYLE (WM_USER + 56)
#endif
/* Hint from a newsgroup for custom flatbar drawing:
Set the TBSTYLE_CUSTOMERASE style, then handle the
NM_CUSTOMDRAW message and do your custom drawing.
*/
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)