X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cdb648efa5ec88c29848311a589bec7ddd2ffb0..8a476eceb8aeea162c8fe368a382a7fbfd7f5865:/contrib/samples/ogl/ogledit/palette.cpp?ds=sidebyside

diff --git a/contrib/samples/ogl/ogledit/palette.cpp b/contrib/samples/ogl/ogledit/palette.cpp
index 988030f2cb..2f6d39c4cf 100644
--- a/contrib/samples/ogl/ogledit/palette.cpp
+++ b/contrib/samples/ogl/ogledit/palette.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -36,13 +36,11 @@
 #include "palette.h"
 
 // Include pixmaps
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "bitmaps/arrow.xpm"
 #include "bitmaps/tool1.xpm"
 #include "bitmaps/tool2.xpm"
 #include "bitmaps/tool3.xpm"
 #include "bitmaps/tool4.xpm"
-#endif
 
 /*
  * Object editor tool palette
@@ -51,20 +49,16 @@
 
 EditorToolPalette::EditorToolPalette(wxWindow* parent, const wxPoint& pos, const wxSize& size,
             long style):
-  TOOLPALETTECLASS(parent, -1, pos, size, style)
+  TOOLPALETTECLASS(parent, wxID_ANY, pos, size, style)
 {
-  currentlySelected = -1;
-
-#if 1 // ndef __WXGTK__
-  SetMaxRowsCols(1000, 1);
-#endif
+    currentlySelected = -1;
 }
 
 bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
 {
   // BEGIN mutual exclusivity code
   if (toggled && (currentlySelected != -1) && (toolIndex != currentlySelected))
-    ToggleTool(currentlySelected, FALSE);
+    ToggleTool(currentlySelected, false);
 
   if (toggled)
     currentlySelected = toolIndex;
@@ -72,10 +66,10 @@ bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
     currentlySelected = -1;
   //  END mutual exclusivity code
 
-  return TRUE;
+  return true;
 }
 
-void EditorToolPalette::OnMouseEnter(int toolIndex)
+void EditorToolPalette::OnMouseEnter(int WXUNUSED(toolIndex))
 {
 }
 
@@ -86,14 +80,15 @@ void EditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFla
 
 EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
 {
-  // Load palette bitmaps
-#ifdef __WXMSW__
-  wxBitmap PaletteTool1("TOOL1");
-  wxBitmap PaletteTool2("TOOL2");
-  wxBitmap PaletteTool3("TOOL3");
-  wxBitmap PaletteTool4("TOOL4");
-  wxBitmap PaletteArrow("ARROWTOOL");
-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+  // Load palette bitmaps. MSW-specific bitmaps no
+  // longer needed.
+#if 0
+  wxBitmap PaletteTool1(_T("TOOL1"));
+  wxBitmap PaletteTool2(_T("TOOL2"));
+  wxBitmap PaletteTool3(_T("TOOL3"));
+  wxBitmap PaletteTool4(_T("TOOL4"));
+  wxBitmap PaletteArrow(_T("ARROWTOOL"));
+#else
   wxBitmap PaletteTool1(tool1_xpm);
   wxBitmap PaletteTool2(tool2_xpm);
   wxBitmap PaletteTool3(tool3_xpm);
@@ -101,20 +96,21 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
   wxBitmap PaletteArrow(arrow_xpm);
 #endif
 
-  EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxSize(-1, -1), wxTB_HORIZONTAL);
+  EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxDefaultSize,
+      wxTB_VERTICAL);
 
   palette->SetMargins(2, 2);
   palette->SetToolBitmapSize(wxSize(22, 22));
 
-  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, "Pointer");
-  palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 1");
-  palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 2");
-  palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 3");
-  palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 4");
+  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Pointer"));
+  palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 1"));
+  palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 2"));
+  palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 3"));
+  palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Tool 4"));
 
   palette->Realize();
 
-  palette->ToggleTool(PALETTE_ARROW, TRUE);
+  palette->ToggleTool(PALETTE_ARROW, true);
   palette->currentlySelected = PALETTE_ARROW;
   return palette;
 }