Changeset 180 for trunk

Timestamp:

10/15/2008 07:09:25 AM (4 years ago)

Author:

guyru

Message:

code cleanup: removed ObjectsID.h

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (2 diffs)
• MainFrame.h (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• ObjectsID.h (deleted)
• openyahtzee.cpp (modified) (1 diff)
• wxDynamicBitmap.cpp (modified) (1 diff)

trunk/src/MainFrame.cpp

@@ -30 +30 @@
 #include "MainFrame.h"
 #include "wxDynamicBitmap.h"
-#include "ObjectsID.h"
 #include "highscores_dialog.h"
 #include "About.h"
@@ -69 +68 @@
 #define VER_DICE_SPACER 10
 
+using namespace main_frame;
 const wxEventType wxEVT_ENABLE_ROLL = wxNewEventType();
 

trunk/src/MainFrame.h

@@ -25 +25 @@
 */
 
+
+#ifndef OPENYAHTZEE_MAIN_FRAME_INC
+#define OPENYAHTZEE_MAIN_FRAME_INC
 #include "ScoreDice.h"
 #include "configuration.h"
-#ifndef MAINFRAME_INC
-#define MAINFRAME_INC
+
+namespace main_frame {
 
 /// MainFrame class - the main window
@@ -123 +126 @@
 
 };
+
+enum {
+        ID_PANEL,
+        ID_SHOWHIGHSCORE,
+        ID_SETTINGS,
+        ID_THEMES,
+        ID_HOWTOPLAY,
+        ID_FAQ,
+        ID_SENDCOMMENT,
+        
+        ID_ACES,
+        ID_TWOS,
+        ID_THREES,
+        ID_FOURS,
+        ID_FIVES,
+        ID_SIXES,
+        ID_THREEOFAKIND,
+        ID_FOUROFAKIND,
+        ID_FULLHOUSE,
+        ID_SMALLSEQUENCE,
+        ID_LARGESEQUENCE,
+        ID_YAHTZEE,
+        ID_CHANCE,
+
+        ID_ACESTEXT,
+        ID_TWOSTEXT,
+        ID_THREESTEXT,
+        ID_FOURSTEXT,
+        ID_FIVESTEXT,
+        ID_SIXESTEXT,
+        ID_THREEOFAKINDTEXT,
+        ID_FOUROFAKINDTEXT,
+        ID_FULLHOUSETEXT,
+        ID_SMALLSEQUENCETEXT,
+        ID_LARGESEQUENCETEXT,
+        ID_YAHTZEETEXT,
+        ID_CHANCETEXT,
+        ID_YAHTZEEBONUSTEXT,
+
+        ID_UPPERSECTIONTOTAL,
+        ID_BONUS,
+        ID_UPPERTOTAL,
+        ID_LOWERTOTAL,
+        ID_GRANDTOTAL,
+        
+        ID_ROLL,
+        ID_DICE1,
+        ID_DICE2,
+        ID_DICE3,
+        ID_DICE4,
+        ID_DICE5,
+        
+        ID_DICE1KEEP,
+        ID_DICE2KEEP,
+        ID_DICE3KEEP,
+        ID_DICE4KEEP,
+        ID_DICE5KEEP,
+};
+
+}
 #endif

trunk/src/Makefile.am

@@ -35 +35 @@
         openyahtzee.ico \
         MainFrame.h \
-        ObjectsID.h \
         ScoreDice.h \
         wxDynamicBitmap.h \

trunk/src/openyahtzee.cpp

@@ -62 +62 @@
 
         // Create the main application window
-        MainFrame *frame = new MainFrame(wxT("Open Yahtzee"), wxDefaultSize, wxDEFAULT_FRAME_STYLE & (~wxRESIZE_BORDER));
+        main_frame::MainFrame *frame = new main_frame::MainFrame(wxT("Open Yahtzee"), wxDefaultSize, wxDEFAULT_FRAME_STYLE & (~wxRESIZE_BORDER));
         
         //Show it

trunk/src/wxDynamicBitmap.cpp

@@ -22 +22 @@
 #include "wxDynamicBitmap.h"
 #include <wx/wx.h>
-#include "ObjectsID.h"
 
 #include <iostream>