wxStaticBitmapBase::DoGetBestSize

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 75a1b4e4ef27926235374e3c89633aa3f76f9ddb..6cf9c3a2d88fd460a86993bedb4dd58bd3df9e13 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -326,7 +326,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
         wxToolBar* toolBar = new wxToolBar(this, -1,
                          wxDefaultPosition, wxDefaultSize,
                          wxBORDER_NONE | wxTB_HORIZONTAL,
         wxToolBar* toolBar = new wxToolBar(this, -1,
                          wxDefaultPosition, wxDefaultSize,
                          wxBORDER_NONE | wxTB_HORIZONTAL,

-                         wxToolBarNameStr, GetMenuBar());
+                         wxToolBarNameStr, menubar);

         SetToolBar(toolBar);
         menubar->SetToolBar(toolBar);
     }
         SetToolBar(toolBar);
         menubar->SetToolBar(toolBar);
     }


@@ -864,9 +864,9 @@ bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)
 // the window proc for wxFrame
 // ---------------------------------------------------------------------------
 
 // the window proc for wxFrame
 // ---------------------------------------------------------------------------
 

-long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-    long rc = 0;
+    WXLRESULT rc = 0;

     bool processed = FALSE;
 
     switch ( message )
     bool processed = FALSE;
 
     switch ( message )