diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc
index 09cecabdd0..32cbd24175 100644
--- a/lcl/interfaces/win32/win32callback.inc
+++ b/lcl/interfaces/win32/win32callback.inc
@@ -1183,21 +1183,6 @@ begin
   Result := CallDefaultWindowProc(Window, Msg, WParam, LParam);
 end;
     
-{------------------------------------------------------------------------------
- Function: ToolBtnWindowProc
- Params: Window_hwnd - The window that receives a message for the window
-         Msg         - The message received
-         WParam      - Word parameter
-         LParam      - Long-integer parameter
-  Returns: non-zero long-integer
-
-  Handles the messages sent to the toolbar button by Windows
- ------------------------------------------------------------------------------}
-Function ToolBtnWindowProc(window_hwnd : hwnd; msg : DWORD; wParam : WPARAM; lParam : LPARAM) : LRESULT; stdcall;
-begin
-  Result := Windows.DefWindowProc(window_hwnd, Msg, WParam, LParam);
-end;
-
 {------------------------------------------------------------------------------
  Procedure: TimerCallBackProc
  Params: window_hnd - handle of window for timer message, not set in this implementation
@@ -1253,6 +1238,10 @@ end;
 
 {
   $Log$
+  Revision 1.120  2004/06/20 20:36:55  micha
+  remove old obsolete/commented toolbutton code
+  rename lazarusform classname to window, because we use it for panels, notebookpages, etc too
+
   Revision 1.119  2004/06/20 13:58:15  micha
   fix combobox edit being gray
 
diff --git a/lcl/interfaces/win32/win32int.pp b/lcl/interfaces/win32/win32int.pp
index 3d3778c173..7fea2caf40 100644
--- a/lcl/interfaces/win32/win32int.pp
+++ b/lcl/interfaces/win32/win32int.pp
@@ -148,7 +148,6 @@ Type
         Desc: PRawImageDescription);
 
     Function WinRegister: Boolean;
-//    Function ToolBtnWinRegister: Boolean;
     Procedure SetOwner(Window: HWND; Owner: TObject);
     Procedure PaintPixmap(Surface: TObject; PixmapData: Pointer);
     Procedure NormalizeIconName(Var IconName: String);
@@ -249,8 +248,7 @@ type
 
 const
   BOOL_RESULT: Array[Boolean] Of String = ('False', 'True');
-  ClsName : array[0..20] of char = 'LazarusForm'#0;
-  ToolBtnClsName : array[0..20] of char = 'ToolbarButton'#0;
+  ClsName : array[0..6] of char = 'Window'#0;
 
 var
   OnClipBoardRequest: TClipboardRequestEvent;
@@ -274,6 +272,10 @@ End.
 { =============================================================================
 
   $Log$
+  Revision 1.87  2004/06/20 20:36:55  micha
+  remove old obsolete/commented toolbutton code
+  rename lazarusform classname to window, because we use it for panels, notebookpages, etc too
+
   Revision 1.86  2004/06/18 20:47:34  vincents
   fixed pasting from clipboard
 
diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc
index 953108c28f..c4c7043e69 100644
--- a/lcl/interfaces/win32/win32object.inc
+++ b/lcl/interfaces/win32/win32object.inc
@@ -109,7 +109,6 @@ Begin
     DestroyWindow(FAppHandle);
 
   Windows.UnregisterClass(@ClsName, System.HInstance);
-//  Windows.UnregisterClass(@ToolBtnClsName, System.HInstance);
 
   if FThemeLibrary <> 0 then
     FreeLibrary(FThemeLibrary);
@@ -136,13 +135,7 @@ Begin
     writeln('Trace:Win32Object.Init - Register Failed');
     Exit;
   End;
-{  
-  If Not ToolBtnWinRegister then
-  Begin
-    Assert(False, 'Trace:Win32Object.Init - Toolbar button Register Failed');
-    Exit;
-  End;
-}
+
   //Init stock objects;
   LogBrush.lbStyle := BS_NULL;
   FStockNullBrush := CreateBrushIndirect(LogBrush);
@@ -1306,26 +1299,6 @@ Begin
   Assert(False, 'Trace:WinRegister - Exit');
 End;
 
-(*
-Function TWin32WidgetSet.ToolBtnWinRegister: boolean;
-var WinClass: WndClass;
-begin
-  with WinClass do begin
-    Style := 0{CS_HRedraw or CS_VRedraw};
-    lpfnWndProc := @ToolBtnWindowProc;
-    cbClsExtra := 40;
-    cbWndExtra := 40;
-    hInstance := System.HInstance;
-    hIcon := 0{LoadIcon(0, IDI_Application)};
-    hCursor := 0{LoadCursor(0, IDC_Arrow)};
-    hbrBackground := GetStockObject(WHITE_BRUSH);
-    lpszMenuName := nil;
-    lpszClassName := @ToolBtnClsName;
-  end;
-  Result := Windows.RegisterClass(@WinClass) <> 0;
-end;
-*)
-
 {------------------------------------------------------------------------------
   Method: TWin32WidgetSet.UpdateThemesActive
   Params:  None
@@ -2452,14 +2425,6 @@ Begin
       pClassName := TOOLBARCLASSNAME;
       Flags := Flags OR CCS_ADJUSTABLE;
     End;
-{    
-    csToolButton:
-    Begin
-      pClassName := ToolBtnClsName;
-      Flags := 0;
-      SubClassWndProc := nil;
-    End;
-}    
     // TCustomPage - Notebook page
     csPage:
     Begin
@@ -3281,6 +3246,10 @@ End;
 
 {
   $Log$
+  Revision 1.213  2004/06/20 20:36:55  micha
+  remove old obsolete/commented toolbutton code
+  rename lazarusform classname to window, because we use it for panels, notebookpages, etc too
+
   Revision 1.212  2004/06/20 13:58:15  micha
   fix combobox edit being gray