Fixed const problems in status bar code, changed panelg.cpp temporarily to

stop infinite loop, added notebook.cpp in wxMSW makefiles. Fixed #pragma
in utilscmn.cpp YET again.

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 5ccba3701c738b304d40bdba6eba642d889628af..664449d5b8eb2187feedef734834c04975011306 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -91,7 +91,7 @@ public:
   virtual void SetStatusText(const wxString& text, int number = 0);
 
   // Set status line widths
-  virtual void SetStatusWidths(int n, int *widths_field);
+  virtual void SetStatusWidths(int n, const int widths_field[]);
 
   // Hint to tell framework which status bar to use
   // TODO: should this go into a wxFrameworkSettings class perhaps?

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index 5de48abeb02a0d84aa48e28c96cdf838c553bca3..1b8bd8d8b6a8266b07a2b00c55fcd26a119a9927 100644 (file)
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -31,14 +31,14 @@ public:
   bool Create(wxWindow *parent, wxWindowID id = -1, long style = wxST_SIZEGRIP);
 
   // a status line can have several (<256) fields numbered from 0
-  virtual void SetFieldsCount(int number = 1, int *widths = NULL);
+  virtual void SetFieldsCount(int number = 1, const int widths[] = NULL);
 
   // each field of status line has it's own text
   virtual void     SetStatusText(const wxString& text, int number = 0);
   virtual wxString GetStatusText(int number = 0) const;
 
   // set status line fields' widths
-  virtual void SetStatusWidths(int n, int *widths_field);
+  virtual void SetStatusWidths(int n, const int widths_field[]);
 
   // we're going to process WM_SIZE (of the parent window)
   void OnSize(wxSizeEvent& event);
@@ -46,7 +46,7 @@ public:
   DECLARE_EVENT_TABLE()
 
 protected:
-  void CopyFieldsWidth(int *widths);
+  void CopyFieldsWidth(const int widths[]);
   void SetFieldsWidth();
 };
 

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 100112b3319a399e9e6a81d6c6efd3cd4ca8dac6..e19b0aa7133b03c98f9fc0031a393e418ef0a1f4 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -215,7 +215,7 @@ void wxPrintData::ConvertToNative(void)
     pd->Flags = PD_RETURNDC ;
 //    pd->lStructSize = sizeof( PRINTDLG );
     pd->lStructSize = 66 ;
-    pd->hwndOwner=(HANDLE)NULL;
+    pd->hwndOwner=(HWND)NULL;
     pd->hDevNames=(HANDLE)NULL;
     pd->hInstance=(HINSTANCE)NULL;
     pd->lCustData = (LPARAM) NULL;

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 349d6f04a0755b47f164a4e6b9c80324b2d326ee..196f506ae727910acf8f3dc14a3fdb5e51791973 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "utils.h"
+#pragma implementation "utilscmn.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index b0f95fd82c5f7bdb6cd2ef3ef99df0046b0ef708..05bd8acb9d9a8eac79905d1eed5ff628f54f2c3f 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -112,6 +112,9 @@ void wxPanel::OnNavigationKey(wxNavigationKeyEvent& event)
 // set focus to the next child which accepts it (or first/last if node == NULL)
 bool wxPanel::SetFocusToNextChild(wxNode *node, bool bForward)
 {
+       // Added by JACS since this seems to cause an infinite loop.
+       return FALSE;
+
   // @@ using typed list would be better...
   #define WIN(node) ((wxWindow *)(node->Data()))
 

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 0688f16c7d36eb9128ea7b7ed8c3889d02ea3a43..2f5c66c8f09597ab7068718f52ab59250062fd33 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -94,7 +94,7 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
   return success;
 }
 
-void wxStatusBar::SetFieldsCount(int number, const int *widths)
+void wxStatusBar::SetFieldsCount(int number, const int widths[])
 {
   m_nFields = number;
 
@@ -138,7 +138,7 @@ wxString wxStatusBar::GetStatusText(int n) const
     return m_statusStrings[n];
 }
 
-void wxStatusBar::SetStatusWidths(int n, const int *widths_field)
+void wxStatusBar::SetStatusWidths(int n, const int widths_field[])
 {
   // only set status widths, when n == number of statuswindows
   if (n == m_nFields)

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index a9536f2fcc2f97bb0a7f607f1456888af29a5b65..6d6ce018ccbca36d5a917fe3a4f294ae4cde155e 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -510,7 +510,7 @@ void wxDC::DrawRectangle(long x, long y, long width, long height)
         HPEN orig_pen = NULL;
 
         if (do_pen || !m_pen.Ok())
-               orig_pen = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_PEN));
+               orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
 
         (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
                  XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1);
@@ -522,7 +522,7 @@ void wxDC::DrawRectangle(long x, long y, long width, long height)
         HBRUSH orig_brush = NULL;
 
         if (do_brush || !m_brush.Ok())
-               orig_brush = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_BRUSH));
+               orig_brush = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH) ::GetStockObject(NULL_BRUSH));
 
         (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
                  XLOG2DEV(x2), YLOG2DEV(y2));
@@ -592,7 +592,7 @@ void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
 
   // draw pie with NULL_PEN first and then outline otherwise a line is
   // drawn from the start and end points to the centre
-  HPEN orig_pen = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_PEN));
+  HPEN orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
   if (m_signY > 0)
   {
     (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,
@@ -702,7 +702,7 @@ void wxDC::SetBrush(const wxBrush& brush)
     if (m_brush.GetResourceHandle())
     {
       HBRUSH b = 0;
-      b = ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ;
+      b = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ;
       if (!m_oldBrush)
         m_oldBrush = (WXHBRUSH) b;
     }
@@ -716,7 +716,7 @@ void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit)
 #if DEBUG > 1
     wxDebugMsg("wxDC::DrawText: Selecting HFONT %X\n", m_font.GetResourceHandle());
 #endif
-    HFONT f = ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
+    HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
     if (!m_oldFont)
       m_oldFont = (WXHFONT) f;
   }
@@ -914,8 +914,8 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
   GetTextExtentPoint((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect);
   GetTextMetrics((HDC) m_hDC, &tm);
 
-  if (x) *x = XDEV2LOGREL(sizeRect.cx);
-  if (y) *y = YDEV2LOGREL(sizeRect.cy);
+  *x = XDEV2LOGREL(sizeRect.cx);
+  *y = YDEV2LOGREL(sizeRect.cy);
   if (descent) *descent = tm.tmDescent;
   if (externalLeading) *externalLeading = tm.tmExternalLeading;
 }
@@ -1365,3 +1365,4 @@ void wxDC::GetTextExtent(const wxString& string, float *x, float *y,
         *externalLeading = externalLeading1;
 }
 #endif
+

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index cd070d1aed31cffd7bc59dc5cebae24b14cca3c7..380bcc95a28d862bec06e1727772e34b402fccb4 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -390,7 +390,7 @@ void wxFrame::SetStatusText(const wxString& text, int number)
   m_frameStatusBar->SetStatusText(text, number);
 }
 
-void wxFrame::SetStatusWidths(int n, int *widths_field)
+void wxFrame::SetStatusWidths(int n, const int widths_field[])
 {
   wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
 

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 7bfc10906a3ba497060baf2c761e64cf71f2f146..23dbe73e4d5d346902fa37853aba1a223a90feda 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -157,6 +157,7 @@ MSWOBJS = \
   $(MSWDIR)\minifram.obj \
   $(MSWDIR)\msgdlg.obj \
   $(MSWDIR)\nativdlg.obj \
+  $(MSWDIR)\notebook.obj \
   $(MSWDIR)\ownerdrw.obj \
   $(MSWDIR)\palette.obj \
   $(MSWDIR)\pen.obj \
@@ -315,6 +316,8 @@ $(MSWDIR)\msgdlg.obj:     $(MSWDIR)\msgdlg.$(SRCSUFF)
 
 $(MSWDIR)\nativdlg.obj:     $(MSWDIR)\nativdlg.$(SRCSUFF)
 
+$(MSWDIR)\notebook.obj:     $(MSWDIR)\notebook.$(SRCSUFF)
+
 $(MSWDIR)\ownerdrw.obj:     $(MSWDIR)\ownerdrw.$(SRCSUFF)
 
 $(MSWDIR)\palette.obj:     $(MSWDIR)\palette.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index fb2ed351f8735e99903d420e9d5db84d0ecabf91..594bfc4da93cd7933a1ddc7783facaab67b3cd72 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -161,6 +161,7 @@ MSWOBJS = \
   minifram.$(OBJSUFF) \
   msgdlg.$(OBJSUFF) \
   nativdlg.$(OBJSUFF) \
+  notebook.$(OBJSUFF) \
   ownerdrw.$(OBJSUFF) \
   palette.$(OBJSUFF) \
   pen.$(OBJSUFF) \

diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt
index 771757479adbf957aed714fd4e6d40d50b6da5a1..455d1af5995bff75ffe2e54269e1be00a9c07d0b 100644 (file)
--- a/src/msw/makefile.nt
+++ b/src/msw/makefile.nt
@@ -163,6 +163,7 @@ MSWOBJS = \
   $(MSWDIR)\minifram.obj \
   $(MSWDIR)\msgdlg.obj \
   $(MSWDIR)\nativdlg.obj \
+  $(MSWDIR)\notebook.obj \
   $(MSWDIR)\ownerdrw.obj \
   $(MSWDIR)\palette.obj \
   $(MSWDIR)\pen.obj \

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 24f673df06ba1d8f06726559e908746dd17e143a..882cd41f456b4156447cae28794a6519c62192b1 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -105,10 +105,10 @@ wxNotebook::wxNotebook()
 
 // the same arguments as for wxControl
 wxNotebook::wxNotebook(wxWindow *parent,
-                       const wxWindowID id, 
+                       wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,
-                       const long style,
+                       long style,
                        const wxString& name)
 {
   Init();
@@ -118,10 +118,10 @@ wxNotebook::wxNotebook(wxWindow *parent,
 
 // Create() function
 bool wxNotebook::Create(wxWindow *parent,
-                        const wxWindowID id, 
+                        wxWindowID id,
                         const wxPoint& pos,
                         const wxSize& size,
-                        const long style,
+                        long style,
                         const wxString& name)
 {
   // base init
@@ -414,7 +414,7 @@ void wxNotebook::Command(wxCommandEvent& event)
   wxFAIL_MSG("wxNotebook::Command not implemented");
 }
 
-bool wxNotebook::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
 {
   wxNotebookEvent event(wxEVT_NULL, m_windowId, 
                         TabCtrl_GetCurSel(m_hwnd), m_nSelection);

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 0b737b9e1dcb72fd9bb3f44b5df1af909c2fcecc..8cc90dee0291f57020aa599f6bc97af6036983c2 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -95,7 +95,10 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
 {
   SetParent(parent);
 
-  m_windowId = id == -1 ? NewControlId() : id;
+  if (id == -1)
+    m_windowId = NewControlId();
+  else
+    m_windowId = id;
 
   DWORD wstyle = WS_CHILD | WS_VISIBLE;
   if ( style & wxST_SIZEGRIP )
@@ -116,7 +119,7 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
   return TRUE;
 }
 
-void wxStatusBar95::CopyFieldsWidth(int *widths)
+void wxStatusBar95::CopyFieldsWidth(const int widths[])
 {
   if (widths && !m_statusWidths)
     m_statusWidths = new int[m_nFields];
@@ -131,7 +134,7 @@ void wxStatusBar95::CopyFieldsWidth(int *widths)
   }
 }
 
-void wxStatusBar95::SetFieldsCount(int nFields, int *widths)
+void wxStatusBar95::SetFieldsCount(int nFields, const int widths[])
 {
   wxASSERT( (nFields > 0) && (nFields < 255) );
 
@@ -141,7 +144,7 @@ void wxStatusBar95::SetFieldsCount(int nFields, int *widths)
   SetFieldsWidth();
 }
 
-void wxStatusBar95::SetStatusWidths(int n, int *widths)
+void wxStatusBar95::SetStatusWidths(int n, const int widths[])
 {
   // @@ I don't understand what this function is for...
   wxASSERT( n == m_nFields );
@@ -218,6 +221,7 @@ wxString wxStatusBar95::GetStatusText(int nField) const
   if (len > 0)
   {
         StatusBar_GetText(hwnd, nField, str.GetWriteBuf(len));
+        str.UngetWriteBuf();
   }
   return str;
 }

diff --git a/utils/wxprop/src/prop.cpp b/utils/wxprop/src/prop.cpp
index 35bf277302ce64c1b43cf7313dce1a10cf8d23bd..32e68f547b0ac86304fff3f888bff0cd700f4b75 100644 (file)
--- a/utils/wxprop/src/prop.cpp
+++ b/utils/wxprop/src/prop.cpp
@@ -307,7 +307,7 @@ wxPropertyValue *wxPropertyValue::NewCopy(void)
     case wxPropertyValueInteger:
       return new wxPropertyValue(value.integer);
     case wxPropertyValuebool:
-      return new wxPropertyValue((value.integer != 0));
+      return new wxPropertyValue((bool) (value.integer != 0));
     case wxPropertyValueReal:
       return new wxPropertyValue(value.real);
     case wxPropertyValueString: