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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 0ac154ea73bc437ee69446a19136ec3e114e5258..8713bf3ac26e943d92b5d607d899f31125b238e9 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -172,6 +172,7 @@ MSWOBJS = \
   $(MSWDIR)\radiobut.obj \
   $(MSWDIR)\region.obj \
   $(MSWDIR)\registry.obj \
   $(MSWDIR)\radiobut.obj \
   $(MSWDIR)\region.obj \
   $(MSWDIR)\registry.obj \

+  $(MSWDIR)\regconf.obj \

   $(MSWDIR)\scrolbar.obj \
   $(MSWDIR)\settings.obj \
   $(MSWDIR)\slidrmsw.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)\registry.obj:     $(MSWDIR)\registry.$(SRCSUFF)
 

+$(MSWDIR)\regconf.obj:     $(MSWDIR)\regconf.$(SRCSUFF)
+

 $(MSWDIR)\scrolbar.obj:     $(MSWDIR)\scrolbar.$(SRCSUFF)
 
 $(MSWDIR)\settings.obj:     $(MSWDIR)\settings.$(SRCSUFF)
 $(MSWDIR)\scrolbar.obj:     $(MSWDIR)\scrolbar.$(SRCSUFF)
 
 $(MSWDIR)\settings.obj:     $(MSWDIR)\settings.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index f3a34442d6bfd44462940a72aa59f4cdc2811699..a133fe6a95d792719571d539d16e65fc40a7e732 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -176,6 +176,7 @@ MSWOBJS = \
   radiobut.$(OBJSUFF) \
   region.$(OBJSUFF) \
   registry.$(OBJSUFF) \
   radiobut.$(OBJSUFF) \
   region.$(OBJSUFF) \
   registry.$(OBJSUFF) \

+  regconf.$(OBJSUFF) \

   scrolbar.$(OBJSUFF) \
   settings.$(OBJSUFF) \
   slidrmsw.$(OBJSUFF) \
   scrolbar.$(OBJSUFF) \
   settings.$(OBJSUFF) \
   slidrmsw.$(OBJSUFF) \

diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt
index 6ea50a852e175d533804b89faf28cebd2a6194cf..fc72bd0aba3471dc590399bfd197eb49a26fb53c 100644 (file)
--- a/src/msw/makefile.nt
+++ b/src/msw/makefile.nt
@@ -176,6 +176,7 @@ MSWOBJS = \
   $(MSWDIR)\radiobut.obj \
   $(MSWDIR)\region.obj \
   $(MSWDIR)\registry.obj \
   $(MSWDIR)\radiobut.obj \
   $(MSWDIR)\region.obj \
   $(MSWDIR)\registry.obj \

+  $(MSWDIR)\regconf.obj \

   $(MSWDIR)\scrolbar.obj \
   $(MSWDIR)\settings.obj \
   $(MSWDIR)\slidrmsw.obj \
   $(MSWDIR)\scrolbar.obj \
   $(MSWDIR)\settings.obj \
   $(MSWDIR)\slidrmsw.obj \


@@ -562,6 +563,11 @@ $(MSWDIR)/registry.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
 $(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$@
 $(MSWDIR)/scrolbar.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index aa17ccc352cb74452a3d2f851a524ab3623765ae..c326c6a0da693345825142eaa67b919b4421c7a5 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -140,13 +140,13 @@ void wxRegConfig::SetPath(const wxString& strPath)
 #define LOCAL_MASK        0x8000
 #define IS_LOCAL_INDEX(l) (((l) & LOCAL_MASK) != 0)
 
 #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);
 }
 
 {
   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) ) {
 {
   // 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;
 }
 
   return bOk;
 }
 

-bool wxRegConfig::GetFirstEntry(wxString& str, long& lIndex) const
+bool wxRegConfig::GetFirstEntry(wxString& str, long& lIndex)

 {
   lIndex = 0;
   return GetNextEntry(str, 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) ) {
 {
   // 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;
 }
 
   return bOk;
 }
 

-uint wxRegConfig::GetNumberOfEntries() const
+uint wxRegConfig::GetNumberOfEntries(bool bRecursive) const

 {
   uint nEntries = 0;
 
   // dummy vars
   wxString str;
   long l;
 {
   uint nEntries = 0;
 
   // dummy vars
   wxString str;
   long l;

-  bool bCont = GetFirstEntry(str, l);
+  bool bCont = ((wxRegConfig*)this)->GetFirstEntry(str, l);

   while ( bCont ) {
     nEntries++;
 
   while ( bCont ) {
     nEntries++;
 

-    bCont = GetNextEntry(str, l);
+    bCont = ((wxRegConfig*)this)->GetNextEntry(str, l);

   }
 
   return nEntries;
 }
 
   }
 
   return nEntries;
 }
 

-uint wxRegConfig::GetNumberOfGroups() const
+uint wxRegConfig::GetNumberOfGroups(bool bRecursive) const

 {
   uint nGroups = 0;
 
   // dummy vars
   wxString str;
   long l;
 {
   uint nGroups = 0;
 
   // dummy vars
   wxString str;
   long l;

-  bool bCont = GetFirstGroup(str, l);
+  bool bCont = ((wxRegConfig*)this)->GetFirstGroup(str, l);

   while ( bCont ) {
     nGroups++;
 
   while ( bCont ) {
     nGroups++;
 

-    bCont = GetNextGroup(str, l);
+    bCont = ((wxRegConfig*)this)->GetNextGroup(str, l);

   }
 
   return nGroups;
   }
 
   return nGroups;

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 54a2027c42fb566632c5a3e79de19e3e2ba1c87d..66a1aa5937bd4c1745025a1f9ccdd7e350601de9 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -45,6 +45,7 @@
 #include "wx/app.h"
 #include "wx/msw/private.h"
 
 #include "wx/app.h"
 #include "wx/msw/private.h"
 

+// Styles

 #ifndef TBSTYLE_FLAT
 #define TBSTYLE_LIST            0x1000
 #define TBSTYLE_FLAT            0x0800
 #ifndef TBSTYLE_FLAT
 #define TBSTYLE_LIST            0x1000
 #define TBSTYLE_FLAT            0x0800


@@ -52,6 +53,17 @@
 #endif
  // use TBSTYLE_TRANSPARENT if you use TBSTYLE_FLAT
 
 #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)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)