allow compilation with wxUSE_CHOICEDLG set to 0

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 2a622955cb2705d1cd653863c9cd8cd860f20198..646fd625679e1af574359daefc249bd31dc71a6b 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -80,7 +80,7 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticBox)
        wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticBox)
        wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))

-    wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 /*
        TODO PROPERTIES :
                label
 /*
        TODO PROPERTIES :
                label


@@ -121,7 +121,7 @@ bool wxStaticBox::Create(wxWindow *parent,
     // FIXME: I still think that it isn't the right solution because the static
     //        boxes shouldn't have to be transparent if the redrawing was done
     //        right elsewhere - who ever had to make them transparent in non
     // FIXME: I still think that it isn't the right solution because the static
     //        boxes shouldn't have to be transparent if the redrawing was done
     //        right elsewhere - who ever had to make them transparent in non

-    //        wxWindows programs, after all? But for now it does fix a serious
+    //        wxWidgets programs, after all? But for now it does fix a serious

     //        problem (try resizing the sizers test screen in the layout sample
     //        after removing WS_EX_TRANSPARENT bit) and so let's use it until
     //        we fix the real underlying problem
     //        problem (try resizing the sizers test screen in the layout sample
     //        after removing WS_EX_TRANSPARENT bit) and so let's use it until
     //        we fix the real underlying problem


@@ -154,7 +154,7 @@ wxSize wxStaticBox::DoGetBestSize() const
     return wxSize(wBox, hBox);
 }
 
     return wxSize(wBox, hBox);
 }
 

-long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
     switch ( nMsg )
     {
 {
     switch ( nMsg )
     {