[EXPLORER]: Remove some painting hack from revision 36668 .

[reactos.git] / reactos / base / shell / explorer / shell / mainframe.cpp

diff --git a/reactos/base/shell/explorer/shell/mainframe.cpp b/reactos/base/shell/explorer/shell/mainframe.cpp
index ecbaab3..dd8618a 100644 (file)
--- a/reactos/base/shell/explorer/shell/mainframe.cpp
+++ b/reactos/base/shell/explorer/shell/mainframe.cpp
@@ -33,8 +33,6 @@
 */
 extern HWND create_webchildwindow(const WebChildWndInfo& info);
 
-#include "../resource.h"
-
 #include "../dialogs/settings.h"       // for MdiSdiDlg
 
 //#define _NO_REBAR
@@ -334,15 +332,8 @@ bool MainFrameBase::ProcessMessage(UINT nmsg, WPARAM wparam, LPARAM lparam, LRES
                break;
 
          case WM_SIZE: {
-#ifdef __REACTOS__     ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed
-               int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0);
-               MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE);
-#else
-               resize_frame(LOWORD(lparam), HIWORD(lparam));
-               SendMessage(_hwndrebar, WM_SIZE, 0, 0);
-#endif
-
-
+               resize_frame(LOWORD(lparam), HIWORD(lparam));
+               SendMessage(_hwndrebar, WM_SIZE, 0, 0);
                break;} // do not pass message to DefFrameProc
 
          case WM_GETMINMAXINFO: {
@@ -771,13 +762,12 @@ MDIMainFrame::MDIMainFrame(HWND hwnd)
                extraBtns.iBitmap = 8;
                SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns);
        }
-#ifndef __REACTOS__ // don't insert reg button for ROS. Regedit should be used.
+
         // insert Registry button
        extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Reg.\0"));
        extraBtns.idCommand = ID_DRIVE_REGISTRY;
        extraBtns.iBitmap = 9;
        SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns);
-#endif
 
 #ifdef _DEBUG
         // insert FAT direct file system access button