Added wxUSE_NUMBERDLG to setup.h; added some files to VC++ project files;

added missing virtual function from wxSliderMSW

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 7a7ef8146a4d47f08804b72bebded8865a18b3cf..e11c02bd6c63816fe52dbc90c70393db150d866c 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -596,6 +596,9 @@
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 
+// number entry dialog
+#define wxUSE_NUMBERDLG 1
+
 // ----------------------------------------------------------------------------
 // Metafiles support
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msw/slidrmsw.h b/include/wx/msw/slidrmsw.h
index 34dbe924515b605a572d3057e24b39bddb46efdc..5dd73da601e50b65aa5ad7fbfc8e92c5e6d9f279 100644 (file)
--- a/include/wx/msw/slidrmsw.h
+++ b/include/wx/msw/slidrmsw.h
@@ -62,6 +62,10 @@ public:
     void SetLineSize(int lineSize);
     int GetLineSize() const;
 
+    // these methods get/set the length of the slider pointer in pixels
+    virtual void SetThumbLength(int lenPixels);
+    virtual int GetThumbLength() const ;
+
     // IMPLEMENTATION
     WXHWND GetStaticMin() const { return m_staticMin; }
     WXHWND GetStaticMax() const { return m_staticMax; }

diff --git a/samples/docvwmdi/doc.h b/samples/docvwmdi/doc.h
index b6c4a692a36012147d1a7ebed67ad41d57db776d..9440f374e0460fde2df2cfe3a14ba73a777c85c5 100644 (file)
--- a/samples/docvwmdi/doc.h
+++ b/samples/docvwmdi/doc.h
@@ -17,6 +17,7 @@
 #define __DOCSAMPLEH__
 
 #include "wx/docview.h"
+#include "wx/cmdproc.h"
 
 // Plots a line from one point to the other
 class DoodleLine: public wxObject

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 92183550679e5abac3606213aca2a5f0dc314009..bc27fbfe07ecdcabb917f23d0a3a50afbf36f411 100644 (file)
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -131,7 +131,7 @@ wxHelpFrame::OnButton(wxCommandEvent &ev)
    else if(id == m_IdSearch)
    {
       wxString str = m_combo->GetValue();
-      if(m_combo->FindString(str) == -1 && m_combo->Number() < MAX_COMBO_ENTRIES)
+      if(m_combo->FindString(str) == -1 && m_combo->GetCount() < MAX_COMBO_ENTRIES)
          m_combo->Append(str);
       m_controller->KeywordSearch(str);
    }

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 8b0ff3270d7f35acfb34e3b3baddadcfc986a644..6ff16e1ff835f2f19da9eab37ab23a50b5c1ed0f 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -507,7 +507,8 @@ void wxFrameMSW::SetMenuBar(wxMenuBar *menubar)
         }
         else
         {
-            menubar->Detach();
+            if (menubar->IsAttached())
+                menubar->Detach();
 
             m_hMenu = menubar->Create();
 

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index e15df2c855634e7892cac270b1e39cac33ddbc52..4de484376f65f1a06351c05a66082f4dee649652 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -682,7 +682,8 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Append(menu, title) )
         return FALSE;
 
-    menu->Attach(this);
+    // Already done in Append above
+    //menu->Attach(this);
 
     m_titles.Add(title);
 

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index bdab68395f2b390ea0617aa7674b98e794552605..9824dafd2a4f473746692d5f45dd67322ae21055 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -509,6 +509,17 @@ int wxSliderMSW::GetLineSize() const
   return m_lineSize;
 }
 
+// Not yet implemented
+void wxSliderMSW::SetThumbLength(int WXUNUSED(lenPixels))
+{
+}
+
+// Not yet implemented
+int wxSliderMSW::GetThumbLength() const
+{
+    return 0;
+}
+
 bool wxSliderMSW::ContainsHWND(WXHWND hWnd) const
 {
     return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index c08a2cc16894cb2656bb1dddecee5279d22d18ec..a139a1bb4b5aa5482a2caff97c2163eb91e728af 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -400,6 +400,10 @@ SOURCE=.\common\quantize.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\radiocmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\resource.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index d0bd84c52d07ae3570f83fa5ac8af336fb989def..4a27409903d1d9a87d8ffd4f2b32fd95be27095e 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -407,6 +407,10 @@ SOURCE=.\common\quantize.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\radiocmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\resourc2.cpp
 # End Source File
 # Begin Source File