Added a file

[wxWidgets.git] / src / univ / themes / win32.cpp

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 68178a25e31f1ae59142ed5324a89098b6a66dfd..596bc217a36a2e2d9cdf2420b28a08e812d7fd56 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -2410,7 +2410,6 @@ void wxWin32Renderer::DrawSliderTicks(wxDC& dc,
     DrawLine(dc, x2, y1, x2, y2, orient == wxVERTICAL);
 }
 
     DrawLine(dc, x2, y1, x2, y2, orient == wxVERTICAL);
 }
 

-#if wxUSE_MENUS

 // ----------------------------------------------------------------------------
 // menu and menubar
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // menu and menubar
 // ----------------------------------------------------------------------------


@@ -2445,7 +2444,7 @@ private:
                 GetMenuGeometry(wxWindow *, const wxMenu&) const;
 };
 
                 GetMenuGeometry(wxWindow *, const wxMenu&) const;
 };
 

-#endif // wxUSE_WAVE
+#endif // wxUSE_MENUS

 
 // FIXME: all constants are hardcoded but shouldn't be
 static const wxCoord MENU_LEFT_MARGIN = 9;
 
 // FIXME: all constants are hardcoded but shouldn't be
 static const wxCoord MENU_LEFT_MARGIN = 9;


@@ -2680,9 +2679,6 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win,
 
     return gi;
 }
 
     return gi;
 }

-<<<<<<< win32.cpp
-#endif
-=======

 
 #else // !wxUSE_MENUS
 
 
 #else // !wxUSE_MENUS
 


@@ -2725,7 +2721,6 @@ wxWin32Renderer::GetMenuGeometry(wxWindow *WXUNUSED(win),
 
 #endif // wxUSE_MENUS/!wxUSE_MENUS
 
 
 #endif // wxUSE_MENUS/!wxUSE_MENUS
 

->>>>>>> 1.5

 // ----------------------------------------------------------------------------
 // combobox
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // combobox
 // ----------------------------------------------------------------------------